Mercurial > hg

view mercurial/mergeutil.py @ 49782:cafe34655335 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hghave: detect Python 3.10 and 3.11 as well Noticed because test-contrib-relnotes.t was skipped.
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 11 Dec 2022 16:44:50 +0400
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')")
        )