--- a/mercurial/dirstate.py	Fri Oct 10 13:31:06 2014 -0500
+++ b/mercurial/dirstate.py	Sat Oct 11 14:05:09 2014 -0500
@@ -451,11 +451,7 @@
         '''Mark a file merged.'''
         if self._pl[1] == nullid:
             return self.normallookup(f)
-        s = os.lstat(self._join(f))
-        self._addpath(f, 'm', s.st_mode,
-                      s.st_size & _rangemask, int(s.st_mtime) & _rangemask)
-        if f in self._copymap:
-            del self._copymap[f]
+        return self.otherparent(f)
 
     def drop(self, f):
         '''Drop a file from the dirstate'''