Mercurial Mercurial > hg-stable / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 26767 69a121c378ef
parent 26751 520defbc0335
child 26781 1aee2ab0f902 
--- 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'))
hg-stable