Mercurial > hg

view mercurial/mergeutil.py @ 49403:ac4fda5d3ccd stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debug-discovery: do not abort on unrelated repositories This is a useful case to consider, so we should not abort in this case. A warning is still issued.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 26 Jul 2022 10:39:27 +0200
parents 6000f5b25c9b
children
line wrap: on
line source

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