Mercurial Mercurial > mercurial / 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 25843 bf9ea348b487
parent 25754 19cc443aac34
child 25844 18541e9510c5 
--- a/mercurial/merge.py	Thu Jun 25 17:52:20 2015 -0500
+++ b/mercurial/merge.py	Thu Jun 25 17:53:16 2015 -0500
@@ -1070,6 +1070,7 @@
                     # Allow jumping branches if clean and specific rev given
                     pas = [p1]
 
+        # deprecated config: merge.followcopies
         followcopies = False
         if overwrite:
             pas = [wc]
mercurial