# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1299364499 21600
# Node ID fac040b7e82277b765dfeb46561e130f8c63ed3e
# Parent  0d3cce1de2331a88479715f4d708a20fba59b46c
merge: drop resolve state for mergers with identical contents (issue2680)

diff -r 0d3cce1de233 -r fac040b7e822 mercurial/merge.py
--- a/mercurial/merge.py	Fri Mar 04 19:21:36 2011 -0600
+++ b/mercurial/merge.py	Sat Mar 05 16:34:59 2011 -0600
@@ -74,7 +74,10 @@
         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