Mercurial > hg
view mercurial/mergeutil.py @ 51055:fa7d307e2150
revlog: remove legacy usage of `_candidate_group_chunk_size`
All core code is now getting the setting from the DeltaConfig object.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 11 Oct 2023 00:04:23 +0200 |
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')") )