Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 25843:bf9ea348b487

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: mark ancient debugging option
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jun 2015 17:53:16 -0500
parents 19cc443aac34
children 18541e9510c5
line wrap: on
line diff
--- 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]