config.txt: move fmt-merge-msg-config.txt to config/

Note that this file is not directly included in config.txt but through merge-config.txt and it's in "merge" section instead of a separate "fmtMergeMsg" section like others. Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
ToBoMi · Oct 29, 2018 · 5a06936 · 5a06936
1 parent ab14f49
commit 5a06936
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Documentation/fmt-merge-msg-config.txt → Documentation/config/fmt-merge-msg.txt b/Documentation/fmt-merge-msg-config.txt → Documentation/config/fmt-merge-msg.txt
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
@@ -51,7 +51,7 @@ OPTIONS
 
 CONFIGURATION
 -------------
-include::fmt-merge-msg-config.txt[]
+include::config/fmt-merge-msg.txt[]
 
 merge.summary::
 	Synonym to `merge.log`; this is deprecated and will be removed in

diff --git 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