Mercurial > hg
view mercurial/mergeutil.py @ 49169:06107198f95b
wix: drop python2 conditionals
Differential Revision: https://phab.mercurial-scm.org/D12595
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 28 Apr 2022 11:01:41 -0400 |
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')") )