HomePhabricator

merge: add a config option to disable path conflict checking

Authored by sid0.

Description

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

Details

Committed
sid0Oct 24 2017, 2:14 PM
Differential Revision
D1222: merge: add a config option to disable path conflict checking
Parents
rHGc2b30348930f: dirstate: clean up when restoring identical backups
Branches
Unknown
Tags
Unknown