Mercurial > public > mercurial-scm > hg-stable

view mercurial/mergeutil.py @ 45607:db11f8f39caf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rhg: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067) Differential Revision: https://phab.mercurial-scm.org/D9109
author Antoine cezar<acezar@chwitlabs.fr>
date Mon, 28 Sep 2020 16:54:35 +0200
parents 32ce4cbaec4b
children fa87536d3d70
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.Abort(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )