mercurial/mergeutil.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 06 Mar 2024 12:07:31 +0100
changeset 51528 88b0e07dd2cd
parent 48875 6000f5b25c9b
permissions -rw-r--r--
branchcache: show the cache file content in test-branches-obsoletes.t This help to track the changes in format between v2 and v3.

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