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.

\.orig$
\.rej$
~$
\.so$
\.pyc$
\.swp$
^build/
^dist/
^doc/.*\.[0-9]$
^MANIFEST$
^.pc/
^patches/
^mercurial/__version__.py$