author | Martin von Zweigbergk <martinvonz@google.com> |
Thu, 22 Sep 2022 16:50:30 -0700 | |
changeset 49498 | f2b1bc19ce90 |
parent 48875 | 6000f5b25c9b |
permissions | -rw-r--r-- |
# mergeutil.py - help for merge processing in mercurial # # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from .i18n import _ from . import error def checkunresolved(ms): if ms.unresolvedcount(): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )