Mercurial > hg
view mercurial/__init__.py @ 45159:e05a488cbed0
mergestate: rename addpath() -> addpathonflict() to prevent confusion
addpath() seems to imply that we are adding a new path/entry to the mergestate.
Differential Revision: https://phab.mercurial-scm.org/D8715
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 09 Jul 2020 14:44:58 +0530 |
parents | d783f945a701 |
children | 6000f5b25c9b |
line wrap: on
line source
# __init__.py - Startup and module loading logic for Mercurial. # # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.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 # Allow 'from mercurial import demandimport' to keep working. import hgdemandimport demandimport = hgdemandimport