Mercurial > public > mercurial-scm > hg

view mercurial/mergeutil.py @ 48957:edab75a4c1da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg: always import hgdemandimport The deleted if condition is always true now that we dropped Python 2 and 3.5. Differential Revision: https://phab.mercurial-scm.org/D12361
author Gregory Szorc <gregory.szorc@gmail.com>
date Tue, 08 Mar 2022 19:08:35 -0800
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')")
        )