config.txt: move mailinfo.* to a separate file

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 662c2713cab4b9762dded702897d9e92ee0a0549..0bb703fbac2b0304cb08fbf5957b34f97000ec52 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -30,7 +30,7 @@ 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