Mercurial > hg

view mercurial/mergeutil.py @ 52002:22a50b7934d2 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ci: display tool version more selectively The goal here is to avoid showing tool version in all case as this create issue for non linux/docker runner that might not have some of them installed. This is currently relevant for the coming mac runner that does not have clang-format installed and does not needs its. This might also be useful in the future to use narrower docker image more specialized for each jobs.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 14 Oct 2024 00:15:25 +0200
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')")
        )