# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1435272796 18000
# Node ID bf9ea348b48702da63c106709cd2a19a8f4417c4
# Parent  fa3f0301cf91516c677799baee6b22c5993f03e4
merge: mark ancient debugging option

diff -r fa3f0301cf91 -r bf9ea348b487 mercurial/merge.py
--- 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]