diff README.rst @ 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 1b59287a1cfa
children c5912e35d06d
line wrap: on
line diff