Mercurial > hg
view mercurial/mergeutil.py @ 49157:5d610521a285 stable
test-dirstate: fix detection of Rust environment variable
The Rust path never actually worked. This change also improves clarity of the
comment. The next change will ensure we print something when this check fails.
Differential Revision: https://phab.mercurial-scm.org/D12601
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Wed, 04 May 2022 15:48:13 +0200 |
parents | d4ba4d51f85f |
children | 6000f5b25c9b |
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 __future__ import absolute_import from .i18n import _ from . import error def checkunresolved(ms): if ms.unresolvedcount(): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )