mercurial/mergeutil.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Thu, 23 Feb 2023 15:27:42 +0100
changeset 50245 e69dc67f79a5
parent 48966 6000f5b25c9b
child 51901 f4733654f144
permissions -rw-r--r--
config-item: declare undeclared path suboption This should prevent issue like the previous commit.

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