mercurial/mergeutil.py
author Antoine Cezar <antoine.cezar@octobus.net>
Wed, 09 Sep 2020 14:50:58 +0200
changeset 45533 89ac95bd4993
parent 45518 32ce4cbaec4b
child 45916 fa87536d3d70
permissions -rw-r--r--
hg-core: add `Manifest` a specialized `Revlog` A facade to `Revlog` to provide a `manifest` specific interface. Differential Revision: https://phab.mercurial-scm.org/D9011

# 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.Abort(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )