mercurial/mergeutil.py
author Raphaël Gomès <rgomes@octobus.net>
Mon, 28 Mar 2022 23:42:16 +0200
changeset 49118 2c78dd3f11de
parent 48875 6000f5b25c9b
child 51863 f4733654f144
permissions -rw-r--r--
dirstatemap: move `_dirs_incr` and `_dirs_decr` methods out of the common They are only used by the Python implementation now Differential Revision: https://phab.mercurial-scm.org/D12516

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