[PATCH 1 of 7 mergedriver] merge.applyupdates: don't return early if merge driver's conclude failed

[Siddharth Agarwal]

# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1447656320 28800
#      Sun Nov 15 22:45:20 2015 -0800
# Node ID 076d659bc45077d8a25e5c09f7d9666c0e9d46b2
# Parent  51fa43a3cd58ceaaf6fa581726fe2eac7c655d18
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()