mercurial/mergeutil.py
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 24 Mar 2022 22:05:49 -0700
changeset 49094 eb8aed493a56
parent 48966 6000f5b25c9b
permissions -rw-r--r--
logcmdutil: use new function for getting first line of string Differential Revision: https://phab.mercurial-scm.org/D12412

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