Mercurial > public > mercurial-scm > hg

diff mercurial/mergeutil.py @ 45916:fa87536d3d70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: raise StateError when there are unresolves merge conflicts Differential Revision: https://phab.mercurial-scm.org/D9392
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 16:48:13 -0800
parents 32ce4cbaec4b
children dfca84970da8
line wrap: on
line diff
--- a/mercurial/mergeutil.py	Mon Nov 23 16:20:02 2020 -0800
+++ b/mercurial/mergeutil.py	Mon Nov 23 16:48:13 2020 -0800
@@ -14,6 +14,6 @@
 
 def checkunresolved(ms):
     if list(ms.unresolved()):
-        raise error.Abort(
+        raise error.StateError(
             _(b"unresolved merge conflicts (see 'hg help resolve')")
         )