mercurial/mergeutil.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 27 Mar 2024 18:51:33 +0000
changeset 51556 f1512dbfee9f
parent 48875 6000f5b25c9b
permissions -rw-r--r--
perf-stream-consume: use the source repository config when applying This might contains critical configuration for the benchmark, like enabling of extensions like narrow.

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