# HG changeset patch
# User mpm@selenic.com
# Date 1122078180 18000
# Node ID eea96285cbf9121c655f1810038164f95e0515da
# Parent  84f9ac74cc30115499ba218c3419ff1b4197b736
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.



diff -r 84f9ac74cc30 -r eea96285cbf9 mercurial/commands.py
diff -r 84f9ac74cc30 -r eea96285cbf9 mercurial/hg.py
--- a/mercurial/hg.py	Fri Jul 22 16:27:30 2005 +0100
+++ b/mercurial/hg.py	Fri Jul 22 19:23:00 2005 -0500
@@ -1507,7 +1507,7 @@
             self.merge3(f, m, o)
             util.set_exec(self.wjoin(f), flag)
             if moddirstate:
-                self.dirstate.update([f], 'm')
+                self.dirstate.update([f], mode)
 
         remove.sort()
         for f in remove: