Mercurial > hg
view mercurial/mergeutil.py @ 46070:8dfcebd084b6
tests: drop the trailing exclamation point from some Windows abort messages
This likely goes with 95c4cca641f6.
Differential Revision: https://phab.mercurial-scm.org/D9537
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 07 Dec 2020 20:53:01 -0500 |
parents | fa87536d3d70 |
children | dfca84970da8 |
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 list(ms.unresolved()): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )