# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1393550763 -3600
# Node ID 89059c450c56a9ecf21492748294e1923ddc69ba
# Parent  8dd867bd67e19d44a945d785b9092a9dbedb7849
merge: mark mergestate as dirty when resolve changes _state

Correctness - no visible difference so far.

diff -r 8dd867bd67e1 -r 89059c450c56 mercurial/merge.py
--- 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