Mercurial > public > mercurial-scm > hg-stable
view mercurial/mergeutil.py @ 50272:8a65b43457ab stable
relnotes: add 6.4 and empty next
author | Rapha?l Gom?s <rgomes@octobus.net> |
---|---|
date | Thu, 02 Mar 2023 23:45:30 +0100 |
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')") )