mercurial/mergeutil.py
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 16 Nov 2020 16:25:04 -0800
changeset 45888 c8860a212770
parent 45526 32ce4cbaec4b
child 45931 fa87536d3d70
permissions -rw-r--r--
errors: raise InputError when line range to followlines() is out of bounds Differential Revision: https://phab.mercurial-scm.org/D9333

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