mercurial/mergeutil.py
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 20 Nov 2020 11:22:28 +0100
changeset 45986 f9f8d8aa9a92
parent 45916 fa87536d3d70
child 46361 dfca84970da8
permissions -rw-r--r--
copies: clarify the return of _merge_copies_dict I misused that function twice in the past few days, so lets clarify the API. Differential Revision: https://phab.mercurial-scm.org/D9418

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