mercurial/mergeutil.py
author Pulkit Goyal <7895pulkit@gmail.com>
Sat, 12 Dec 2020 18:09:16 +0530
changeset 46191 aba979b1b90b
parent 45916 fa87536d3d70
child 46361 dfca84970da8
permissions -rw-r--r--
upgrade: move `printrequirements()` to UpgradeOperation class Part of refactor where we make things more arranged and integrated into single `UpgradeOperation` class. Differential Revision: https://phab.mercurial-scm.org/D9577

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