Mercurial > hg

diff mercurial/merge.py @ 20792:89059c450c56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: mark mergestate as dirty when resolve changes _state Correctness - no visible difference so far.
author Mads Kiilerich <madski@unity3d.com>
date Fri, 28 Feb 2014 02:26:03 +0100
parents 2a4871c2511d
children 6500a2eebee8
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Feb 24 22:42:14 2014 +0100
+++ b/mercurial/merge.py	Fri Feb 28 02:26:03 2014 +0100
@@ -271,6 +271,7 @@
         if r is None:
             # no real conflict
             del self._state[dfile]
+            self._dirty = True
         elif not r:
             self.mark(dfile, 'r')
         return r