# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2011-03-05 22:34:59
# Node ID 6217040b2780f42b892d64f0fcd601ab27b4f5d7
# Parent  a2dc8819bb0d6467fce3f87788652de1204822ea

merge: drop resolve state for mergers with identical contents (issue2680)

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -74,7 +74,10 @@ class mergestate(object):
         fco = octx[ofile]
         fca = self._repo.filectx(afile, fileid=anode)
         r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca)
-        if not r:
+        if r is None:
+            # no real conflict
+            del self._state[dfile]
+        elif not r:
             self.mark(dfile, 'r')
         return r