Mercurial > public > mercurial-scm > hg

diff mercurial/configitems.py @ 34942:2a774cae3a03 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Siddharth Agarwal <sid0@fb.com>
date Tue, 24 Oct 2017 11:15:30 -0700
parents 37450a122128
children a7e49a5b3e6f 0f5521e56b77 5e27afeddaee
line wrap: on
line diff
--- a/mercurial/configitems.py	Tue Oct 24 11:14:38 2017 -0700
+++ b/mercurial/configitems.py	Tue Oct 24 11:15:30 2017 -0700
@@ -579,7 +579,7 @@
     default='abort',
 )
 coreconfigitem('experimental', 'merge.checkpathconflicts',
-    default=True,
+    default=False,
 )
 coreconfigitem('merge', 'followcopies',
     default=True,