mercurial/mergeutil.py
author Raphaël Gomès <rgomes@octobus.net>
Tue, 09 May 2023 11:35:50 +0200
changeset 50460 f57f5ab0e220
parent 48875 6000f5b25c9b
permissions -rw-r--r--
branching: merge stable into default

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