pyoxidized: add a dedicated target in the tests
We will need to setup more items to make the "quick" version work on stable,
having a dedicated operation will allow to contains change to that operation.
Differential Revision: https://phab.mercurial-scm.org/D11286
# 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 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')")
)