Mercurial > hg > mercurial-crew-with-dirclash
view CONTRIBUTORS @ 764:eea96285cbf9
Don't mark files with 'm'erge unless we're actually merging branches
For 3-way merges, we were marking files as 'm', which should only be
used for branch merges. This was causing files to show up in 'hg
status' that aren't actually modified.
author | mpm@selenic.com |
---|---|
date | Fri, 22 Jul 2005 19:23:00 -0500 |
parents | 73540173e14c |
children | 73a432c8040a c2e77581bc84 |
line wrap: on
line source
Andrea Arcangeli <andrea at suse.de> Thomas Arendsen Hein <thomas at intevation.de> Goffredo Baroncelli <kreijack at libero.it> Muli Ben-Yehuda <mulix at mulix.org> Mikael Berthe <mikael at lilotux.net> Vincent Danjean <vdanjean.ml at free.fr> Jake Edge <jake at edge2.net> Michael Fetterman <michael.fetterman at intel.com> Edouard Gomez <ed.gomez at free.fr> Alecs King <alecsk at gmail.com> Vadim Lebedev <vadim at mbdsys.com> Christopher Li <hg at chrisli.org> Chris Mason <mason at suse.com> Chad Netzer <chad.netzer at gmail.com> Bryan O'Sullivan <bos at serpentine.com> Vicent Seguí Pascual <vseguip at gmail.com> Sean Perry <shaleh at speakeasy.net> Nguyen Anh Quynh <aquynh at gmail.com> Arun Sharma <arun at sharma-home.net> Kevin Smith <yarcs at qualitycode.com> Radoslaw Szkodzinski <astralstorm at gorzow.mm.pl> K Thananchayan <thananck at yahoo.com> Andrew Thompson <andrewkt at aktzero.com> Michael S. Tsirkin <mst at mellanox.co.il> Rafael Villar Burke <pachi at mmn-arquitectos.com> Mark Williamson <mark.williamson at cl.cam.ac.uk> If you are a contributor and don't see your name here, please let me know.