Mercurial > hg

view mercurial/mergeutil.py @ 49774:5d9725182d8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-acl: glob the payload size again This size of bundle-2 payload are irrelevant for this test and only appears in its output because other pieces of the debug output are important. We glob it these number before they get in our way again.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 07 Dec 2022 22:40:54 +0100
parents 6000f5b25c9b
children f4733654f144
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')")
        )