diff -r 37450a122128 -r 2a774cae3a03 mercurial/configitems.py
--- 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,