Mercurial > hg

view mercurial/mergeutil.py @ 46414:16c18d5e5dc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 29 Jan 2021 17:32:09 +0530
parents dfca84970da8
children d4ba4d51f85f
line wrap: on
line source

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