Mercurial > hg

view mercurial/mergeutil.py @ 46000:c1bb02738f96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
registrar: clarify the documentation about some byte strings being required I *thought* these needed to be byte strings, but didn't remember and had to search out examples. Differential Revision: https://phab.mercurial-scm.org/D9489
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 28 Nov 2020 16:59:40 -0500
parents fa87536d3d70
children dfca84970da8
line wrap: on
line source

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