Mercurial > hg
diff mercurial/revsetlang.py @ 34556:7a8a16f8ea22
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 | b0790bebfcf8 |
children | dd911f95cbda |