Mercurial > hg

diff mercurial/scmutil.py @ 34556:7a8a16f8ea22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
context: also consider path conflicts when clearing unknown files When clearing unknown files to remove path conflicts, also delete files that conflict with the target file's path. Differential Revision: https://phab.mercurial-scm.org/D785
author Mark Thomas <mbthomas@fb.com>
date Mon, 02 Oct 2017 14:05:30 -0700
parents 6fad8059a970
children 18309380fb88
line wrap: on
line diff