--- 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