mercurial/mergeutil.py
author Raphaël Gomès <rgomes@octobus.net>
Mon, 06 May 2024 18:48:37 +0200
branchstable
changeset 51622 99072b02138f
parent 48875 6000f5b25c9b
permissions -rw-r--r--
Added signature for changeset 028dc3f92dbd

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