Mercurial > hg
view mercurial/mergeutil.py @ 50450:608a69d5d38f
heptapod-ci: display python version
it will be useful to debug in the CI
author | Axel Prel <axel.prel@xcg-consulting.fr> |
---|---|
date | Fri, 07 Apr 2023 14:23:12 +0200 |
parents | 6000f5b25c9b |
children | f4733654f144 |
line wrap: on
line source
# 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 .i18n import _ from . import error def checkunresolved(ms): if ms.unresolvedcount(): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )