Mercurial > hg

view mercurial/mergeutil.py @ 52202:069735062524 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pytype: add relative timestamp to the output if `ts` is available This should help to identify the module that are the slower to analyze.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 08 Nov 2024 02:50:34 +0100
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')")
        )