mercurial/mergeutil.py
author Simon Sapin <simon-commits@exyr.org>
Mon, 30 Nov 2020 19:26:54 +0100
changeset 46011 904647f7d983
parent 45931 fa87536d3d70
child 46435 dfca84970da8
permissions -rw-r--r--
rhg: add a test for --rev with a hex changeset ID And fix error message formatting Differential Revision: https://phab.mercurial-scm.org/D9478

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt Mackall <mpm@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 __future__ import absolute_import

from .i18n import _

from . import error


def checkunresolved(ms):
    if list(ms.unresolved()):
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )