Mercurial > public > mercurial-scm > hg-stable

diff mercurial/configitems.py @ 34941:37450a122128 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ee9243715c59
children 2a774cae3a03
line wrap: on
line diff
--- a/mercurial/configitems.py	Fri Oct 20 05:53:35 2017 -0700
+++ b/mercurial/configitems.py	Tue Oct 24 11:14:38 2017 -0700
@@ -578,6 +578,9 @@
 coreconfigitem('merge', 'checkignored',
     default='abort',
 )
+coreconfigitem('experimental', 'merge.checkpathconflicts',
+    default=True,
+)
 coreconfigitem('merge', 'followcopies',
     default=True,
 )