# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2015-06-25 22:53:16
# Node ID bf9ea348b48702da63c106709cd2a19a8f4417c4
# Parent  fa3f0301cf91516c677799baee6b22c5993f03e4

merge: mark ancient debugging option

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1070,6 +1070,7 @@ def update(repo, node, branchmerge, forc
                     # Allow jumping branches if clean and specific rev given
                     pas = [p1]
 
+        # deprecated config: merge.followcopies
         followcopies = False
         if overwrite:
             pas = [wc]