Mercurial > public > mercurial-scm > hg

view mercurial/mergeutil.py @ 46674:79cfe18c20b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: update expected output in test-http.t The output was introduced in a4c19a162615 and is wrong and unstable. So we glob it as other part of these tests already do. Differential Revision: https://phab.mercurial-scm.org/D10153
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 10 Mar 2021 18:24:23 +0100
parents dfca84970da8
children d4ba4d51f85f
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 ms.unresolvedcount():
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )