# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-16 06:45:20
# Node ID 6618dfd3ea1c15aed75b7ef005a2c36059ff443f
# Parent  4b5dc0d9e89972a5e17eb8c3874fc9640d0522f5

merge.applyupdates: don't return early if merge driver's conclude failed

Somewhat silly oversight -- this prevented the progress bar from being reset.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1014,7 +1014,7 @@ def applyupdates(repo, actions, wctx, mc
         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()