Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
45915:8f50dc096cf4 45916:fa87536d3d70
12 from . import error 12 from . import error
13 13
14 14
15 def checkunresolved(ms): 15 def checkunresolved(ms):
16 if list(ms.unresolved()): 16 if list(ms.unresolved()):
17 raise error.Abort( 17 raise error.StateError(
18 _(b"unresolved merge conflicts (see 'hg help resolve')") 18 _(b"unresolved merge conflicts (see 'hg help resolve')")
19 ) 19 )