Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: mark ancient debugging option
authorMatt Mackall <mpm@selenic.com>
Thu, 25 Jun 2015 17:53:16 -0500
changeset 25843 bf9ea348b487
parent 25842 fa3f0301cf91
child 25844 18541e9510c5
merge: mark ancient debugging option
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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