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.
Metadata-Version: 1.0
Name: mercurial
Version: 0.6
Summary: scalable distributed SCM
Home-page: http://selenic.com/mercurial
Author: Matt Mackall
Author-email: mpm@selenic.com
License: GNU GPL
Description: UNKNOWN
Platform: UNKNOWN