Mercurial > hg

view mercurial/mergeutil.py @ 51326:01db705bbe32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
delta-find: move tested in the _DeltaSearch.__init__ Now that we have an object we can initialize that attribute at initialization time. This will make it available for more method in the future, allowing to split the code.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 23 Nov 2023 01:13:40 +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')")
        )