merge: disable path conflict checking by default (issue5716)
We shouldn't ship a severe perf regression in hg update for 4.4. Differential Revision: https://phab.mercurial-scm.org/D1223
Showing
- mercurial/configitems.py 1 addition, 1 deletionmercurial/configitems.py
- tests/test-audit-path.t 8 additions, 19 deletionstests/test-audit-path.t
- tests/test-commandserver.t 2 additions, 6 deletionstests/test-commandserver.t
- tests/test-merge1.t 10 additions, 9 deletionstests/test-merge1.t
- tests/test-pathconflicts-basic.t 8 additions, 1 deletiontests/test-pathconflicts-basic.t
- tests/test-pathconflicts-merge.t 8 additions, 0 deletionstests/test-pathconflicts-merge.t
- tests/test-pathconflicts-update.t 8 additions, 1 deletiontests/test-pathconflicts-update.t
- tests/test-update-names.t 1 addition, 3 deletionstests/test-update-names.t
Loading
Please register or sign in to comment