diff -r b7a75b9a3386 -r 0407a51b9d8c mercurial/merge.py
--- a/mercurial/merge.py	Tue Jul 11 08:52:55 2017 -0700
+++ b/mercurial/merge.py	Fri Jul 14 14:22:40 2017 -0700
@@ -1613,7 +1613,7 @@
             pas = [p1]
 
         # deprecated config: merge.followcopies
-        followcopies = repo.ui.configbool('merge', 'followcopies', True)
+        followcopies = repo.ui.configbool('merge', 'followcopies')
         if overwrite:
             followcopies = False
         elif not pas[0]: