mercurial/merge.py

--- a/mercurial/merge.py	Sun Oct 11 18:29:50 2015 -0700
+++ b/mercurial/merge.py	Sun Oct 11 18:37:54 2015 -0700
@@ -290,7 +290,7 @@
     def _resolve(self, dfile, wctx, labels=None):
         """rerun merge process for file path `dfile`"""
         if self[dfile] == 'r':
-            return 0
+            return True, 0
         stateentry = self._state[dfile]
         state, hash, lfile, afile, anode, ofile, onode, flags = stateentry
         octx = self._repo[self._other]
@@ -321,11 +321,11 @@
             self._dirty = True
         elif not r:
             self.mark(dfile, 'r')
-        return r
+        return complete, r
 
     def resolve(self, dfile, wctx, labels=None):
         """rerun merge process for file path `dfile`"""
-        return self._resolve(dfile, wctx, labels=labels)
+        return self._resolve(dfile, wctx, labels=labels)[1]
 
 def _checkunknownfile(repo, wctx, mctx, f, f2=None):
     if f2 is None: