# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1444896152 25200
# Node ID 69a121c378ef9f84c026933cca374940d18ea1bb
# Parent  a83110faece160ef81c22ecda2edeeffe288c894
localrepo.commit: abort if merge driver's conclude step hasn't been run yet

This case also requires 'hg resolve --all' to be run before continuing.

diff -r a83110faece1 -r 69a121c378ef mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu Oct 15 00:57:56 2015 -0700
+++ b/mercurial/localrepo.py	Thu Oct 15 01:02:32 2015 -0700
@@ -1564,7 +1564,7 @@
             if unresolved:
                 raise error.Abort(_('unresolved merge conflicts '
                                     '(see "hg help resolve")'))
-            if driverresolved:
+            if driverresolved or ms.mdstate() != 's':
                 raise error.Abort(_('driver-resolved merge conflicts'),
                                   hint=_('run "hg resolve --all" to resolve'))