Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 33499 0407a51b9d8c
parent 33323 252500520d60
child 33808 055fee3547df 
--- 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]:
Mercurial