Mercurial > hg

view mercurial/mergeutil.py @ 49654:86e398a3d598

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ci: bump pytype to 2022.11.18 No particular reason, other than the current build is fairly old. It flagged a few more things (that weren't errors based on the logic around them), but OTOH, some of the pyi stubs it generates are less specific.
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 23 Nov 2022 20:59:53 -0500
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')")
        )