view mercurial/mergeutil.py @ 51292:9c5bd485fbb6

pytype: ignore some signature mismatch in configitems

pytype is grumpy about the dict.update having a more complex signature than the
one we use here.

pytype error:

  itemregister: Overriding method signature mismatch [signature-mismatch]
    Base signature: 'def builtins.dict.update(self) -> None'.
    Subclass signature: 'def itemregister.update(self, other) -> Any'.
    Parameter 'other' must have a default value.

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Olivia Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.


from .i18n import _

from . import error


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