mercurial/mergeutil.py
author Raphaël Gomès <rgomes@octobus.net>
Wed, 03 Mar 2021 12:30:23 +0100
changeset 46627 f4c325bf80fc
parent 46361 dfca84970da8
child 46819 d4ba4d51f85f
permissions -rw-r--r--
requirements: also add a generaldelta constant Continue the cleanup to the remaining requirements Differential Revision: https://phab.mercurial-scm.org/D10106

# 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 ms.unresolvedcount():
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )