Mercurial > hg

view mercurial/mergeutil.py @ 51520:fe8347b984f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branchcache-v3: introduce a v3 format For now the format is the very same, however we will start changing it in future changesets.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 26 Feb 2024 14:20:36 +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')")
        )