mercurial/mergeutil.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Mon, 30 May 2022 23:24:14 +0200
changeset 49265 61cf3d39fd9e
parent 48966 6000f5b25c9b
permissions -rw-r--r--
debugindex: move the logic into its own module Adding more information will significantly increase the amount of code. So we move the code into its own module before making it more complex.

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