Mercurial > hg

view mercurial/mergeutil.py @ 50073:8d02dfac072e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: make `restorebackup` more robust when it is a noop If there are no data_file, we might not be able to determine its filename. Which can be safely ignored. (all this code is on the way out anyway)
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 16 Feb 2023 05:03:28 +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')")
        )