Mercurial > hg
comparison mercurial/hook.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 | fd3b94f1712d |
| children | b3e8d8e4a40d |
comparison
equal
deleted
inserted
replaced
| 45158:ed58ecd59030 | 45159:e05a488cbed0 |
|---|