Mercurial > hg

diff mercurial/utils/stringutil.py @ 45159:e05a488cbed0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c1ccefb513e4
children d502caab76bc
line wrap: on
line diff