Mercurial > hg

view mercurial/mergeutil.py @ 51947:9cfc95e901ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: print the actual timeout value used in `wait-on-file` Previously, it was printing the time passed in, prior to it being scaled up to account for a longer timeout.
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 02 Oct 2024 18:30:12 -0400
parents f4733654f144
children
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 annotations

from .i18n import _

from . import error


def checkunresolved(ms):
    if ms.unresolvedcount():
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )