Mercurial > hg

view mercurial/mergeutil.py @ 48896:4286ec1d9842

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
urllibcompat: remove Python 2 support code We had to move the `import` statements to appease the import checker. This whole module could probably be deleted as its point in life is to pave over Python 2/3 differences. But that's for a different commit. Differential Revision: https://phab.mercurial-scm.org/D12299
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 21 Feb 2022 10:35:20 -0700
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')")
        )