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: