mercurial/mergeutil.py
author Raphaël Gomès <rgomes@octobus.net>
Wed, 21 Dec 2022 12:03:02 +0100
changeset 49824 fdd227585d5a
parent 48875 6000f5b25c9b
child 51863 f4733654f144
permissions -rw-r--r--
verify: format messages directly at the source

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