comparison tests/test-merge-symlinks.t @ 34941:37450a122128 stable

merge: add a config option to disable path conflict checking We've found a severe perf regression in `hg update` caused by the path conflict checking code. The next patch will disable this by default. Differential Revision: https://phab.mercurial-scm.org/D1222
author Siddharth Agarwal <sid0@fb.com>
date Tue, 24 Oct 2017 11:14:38 -0700
parents 00658bb0dfd5
children 5d10f41ddcc4
comparison
equal deleted inserted replaced
34940:c2b30348930f 34941:37450a122128