Mercurial > hg
view mercurial/mergeutil.py @ 49247:3e5f1fb2aec7
revlog: make try block smaller
Making try blocks as small as possible is generally a good idea, especially
when catching very general errors like TypeError.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Mon, 30 May 2022 00:45:00 +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')") )