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.
include hg
recursive-include mercurial *.py
include hgweb.cgi
include hgeditor rewrite-log
include tests/README tests/run-tests tests/test-*[a-z] tests/*.out
include *.txt
include templates/map templates/map-*[a-z]
include templates/*.tmpl
include doc/README doc/*.txt Makefile
recursive-include contrib *
include README
include CONTRIBUTORS
include COPYING
include TODO
include MANIFEST.in