Mercurial > hg
view mercurial/testing/__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 | ae531f5e583c |
children | 99c629101b73 |