config.txt: move gitcvs-config.txt to config/

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 12b6bbf591ee801e0723f59db0e0abe7dc88ec73..0bb703fbac2b0304cb08fbf5957b34f97000ec52 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -30,12 +30,18 @@ merge.verifySignatures::
        If true, this is equivalent to the --verify-signatures command
        line option. See linkgit:git-merge[1] for details.
 
-include::fmt-merge-msg-config.txt[]
+include::config/fmt-merge-msg.txt[]
 
 merge.renameLimit::
        The number of files to consider when performing rename detection
        during a merge; if not specified, defaults to the value of
-       diff.renameLimit.
+       diff.renameLimit. This setting has no effect if rename detection
+       is turned off.
+
+merge.renames::
+       Whether and how Git detects renames.  If set to "false",
+       rename detection is disabled. If set to "true", basic rename
+       detection is enabled.  Defaults to the value of diff.renames.
 
 merge.renormalize::
        Tell Git that canonical representation of files in the