contrib: update PyOxidizer to 0.10.3
This is necessary to work around a bug that caused build failures on
current stable with 0.9.0. This patch was used to build the 5.7rc0 Windows
installers.
Differential Revision: https://phab.mercurial-scm.org/D9858
# 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 list(ms.unresolved()):
raise error.StateError(
_(b"unresolved merge conflicts (see 'hg help resolve')")
)