Mercurial > hg

view mercurial/mergeutil.py @ 45647:9fead7d97069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
grep: add option for logcmdutil.makewalker() to not filter revs by file pats This is needed to implement "grep --all-files".
author Yuya Nishihara <yuya@tcha.org>
date Thu, 10 Sep 2020 18:40:01 +0900
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')")
        )