Mercurial > hg
view mercurial/mergeutil.py @ 45591:f38adf8b0711
hg-core: Explain offset override of first revision
(D8958#inline-14992 followup)
Differential Revision: https://phab.mercurial-scm.org/D9095
author | Antoine cezar<acezar@chwitlabs.fr> |
---|---|
date | Mon, 28 Sep 2020 13:51:16 +0200 |
parents | 32ce4cbaec4b |
children | fa87536d3d70 |
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.Abort( _(b"unresolved merge conflicts (see 'hg help resolve')") )