##// END OF EJS Templates
merge: add a config option to disable path conflict checking...
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
Siddharth Agarwal -
r34942:37450a12 stable
Show More