--- a/mercurial/error.py Mon Jul 13 16:42:44 2020 -0700
+++ b/mercurial/error.py Tue Jul 14 13:35:54 2020 -0700
@@ -106,6 +106,22 @@
__bytes__ = _tobytes
+class ConflictResolutionRequired(InterventionRequired):
+ """Exception raised when a continuable command required merge conflict resolution."""
+
+ def __init__(self, opname):
+ from .i18n import _
+
+ self.opname = opname
+ InterventionRequired.__init__(
+ self,
+ _(
+ b"unresolved conflicts (see 'hg resolve', then 'hg %s --continue')"
+ )
+ % opname,
+ )
+
+
class Abort(Hint, Exception):
"""Raised if a command needs to print an error and exit."""