Mercurial > hg
view mercurial/mergeutil.py @ 50375:29d7a5a8b8c6
crecord: switch a curses argument to bool to appease type checkers
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 01 Mar 2023 11:53:31 -0500 |
parents | 6000f5b25c9b |
children |
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')") )