Mercurial Mercurial > hg-stable / file revision
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/mergeutil.py
author Matt Harbison <matt_harbison@yahoo.com>
Mon, 21 Aug 2023 17:06:47 -0400
changeset 50960 8e5083590cfe
parent 48966 6000f5b25c9b
child 51901 f4733654f144
permissions -rw-r--r--
debugdiscovery: migrate `opts` to native kwargs

# 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')")
        )
hg-stable