mercurial/mergeutil.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Thu, 08 Oct 2020 18:50:46 +0200
changeset 45709 91fafafd5a68
parent 45526 32ce4cbaec4b
child 45931 fa87536d3d70
permissions -rw-r--r--
rust: cleanup some white space in a dock They seems to have sneaked there somehow. Differential Revision: https://phab.mercurial-scm.org/D9201

# 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')")
        )