Mercurial > public > mercurial-scm > hg-stable

view mercurial/mergeutil.py @ 48558:823e906d879d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: properly document the default pattern The default isn't to glob. It's relpath, which does no globbing at all. Thus most commands and options like -X/-I and hg files require `glob:` in front of them to actually do any globbing. I think long ago the default was to glob, but that hasn't been true for a long time.
author Jordi Guti?rrez Hermoso <jordigh@octave.org>
date Fri, 15 Feb 2019 17:20:32 -0500
parents d4ba4d51f85f
children 6000f5b25c9b
line wrap: on
line source

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Olivia Mackall <olivia@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')")
        )