mercurial/mergeutil.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Wed, 08 Dec 2021 05:42:01 +0100
changeset 48463 880adb2cd147
parent 46819 d4ba4d51f85f
child 48875 6000f5b25c9b
permissions -rw-r--r--
test: simplify `debugformat` matching in test-phases.t This will make the test less sensible to unrelated format changing. Differential Revision: https://phab.mercurial-scm.org/D11894

# 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 __future__ import absolute_import

from .i18n import _

from . import error


def checkunresolved(ms):
    if ms.unresolvedcount():
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )