Mercurial > hg-stable

view mercurial/mergeutil.py @ 45635:7d0e54056586

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use native string when comparing with a function's argspec I only found two such bugs in `contrib/perf.py` Differential Revision: https://phab.mercurial-scm.org/D9149
author Raphaël Gomès <rgomes@octobus.net>
date Mon, 05 Oct 2020 10:33:52 +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')")
        )