mercurial/mergeutil.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Mon, 07 Nov 2022 14:24:52 -0500
changeset 49660 bd3b6f363fb9
parent 48875 6000f5b25c9b
child 51863 f4733654f144
permissions -rw-r--r--
debug-revlog: move the code in revlogutils module We have a module dedicated to debug code, let us use it.

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