Mercurial > hg

diff mercurial/merge.py @ 13536:fac040b7e822

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop resolve state for mergers with identical contents (issue2680)
author Matt Mackall <mpm@selenic.com>
date Sat, 05 Mar 2011 16:34:59 -0600
parents 6169493ac3f9
children 1792b8a9422b
line wrap: on
line diff
--- 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