Mercurial > hg

view mercurial/mergeutil.py @ 50277:48b90d18e9de stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
undo-files: use the cleanup function in narrow Lets use the same code, so that we can fix things only once.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 06 Mar 2023 13:02:16 +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')")
        )