Mercurial > hg
view mercurial/mergeutil.py @ 46967:314386a19cff
help: prepend environment variables used in hooks with "$"
Most of them have "$" prefix but some don't, so adding it for consistency.
Differential Revision: https://phab.mercurial-scm.org/D10398
author | Aay Jay Chan <aayjaychan@itopia.com.hk> |
---|---|
date | Thu, 01 Apr 2021 22:43:55 +0800 |
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')") )