Mercurial > hg

view mercurial/mergeutil.py @ 48184:8fae2cc6ee86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dispatch: don't change error status if flushing stdio fails If we already have a non-zero exit code, I don't think we should change it to 255 because we fail to flush stdio. This may not matter yet, but it will matter when I make a killed pager result in exit code 250 (it's currently 255). Differential Revision: https://phab.mercurial-scm.org/D11626
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 08 Oct 2021 13:34:33 -0700
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')")
        )