mercurial/mergeutil.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Tue, 23 May 2023 10:24:57 +0200
changeset 50709 517fcefe8a39
parent 48875 6000f5b25c9b
child 51863 f4733654f144
permissions -rw-r--r--
stream-clone: add a stream-v3 variant of test-persistent-nodemap.t This will be useful to track and validate future changes to the stream-v3 protocol.

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