Mercurial > hg
view mercurial/mergeutil.py @ 50770:d64df6b35007
rust-config: add docstring to inner `get_parse` method
The signature is quite heavy, a docstring to explain the idea doesn't hurt.
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Wed, 12 Jul 2023 10:59:19 +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')") )