Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
763:84f9ac74cc30 | 764:eea96285cbf9 |
---|