--- a/mercurial/merge.py	Mon Nov 16 17:15:36 2015 -0800
+++ b/mercurial/merge.py	Sun Nov 15 22:45:20 2015 -0800
@@ -1014,7 +1014,7 @@
         if not driverconclude(repo, ms, wctx, labels=labels):
             # XXX setting unresolved to at least 1 is a hack to make sure we
             # error out
-            return updated, merged, removed, max(unresolved, 1)
+            unresolved = max(unresolved, 1)
 
         ms.commit()