Mercurial > hg

view mercurial/mergeutil.py @ 51344:f3f35b37f4b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
delta-find: move good delta code earlier in the class Nothing change except the code location. This greatly helps readability of the next future diff,
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 07 Jan 2024 00:56:15 +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')")
        )