Mercurial > hg

view mercurial/mergeutil.py @ 51288:8b2ea2246a5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pytype: convert type comment for inline variable too Same logic as for the previous changeset, but for "type comment" annotating variables, not function/method. As for the previous changeset, we had to adjust for of the types to actually match what was happening.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 20 Dec 2023 11:23:09 +0100
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')")
        )