config.txt: move merge-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c3c92bc..441787e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -371,7 +371,7 @@
include::config/man.txt[]
-include::merge-config.txt[]
+include::config/merge.txt[]
mergetool.<tool>.path::
Override the path for the given tool. This is useful in case
diff --git a/Documentation/merge-config.txt b/Documentation/config/merge.txt
similarity index 97%
rename from Documentation/merge-config.txt
rename to Documentation/config/merge.txt
index 0bb703f..321d1c8 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/config/merge.txt
@@ -30,7 +30,7 @@
If true, this is equivalent to the --verify-signatures command
line option. See linkgit:git-merge[1] for details.
-include::config/fmt-merge-msg.txt[]
+include::fmt-merge-msg.txt[]
merge.renameLimit::
The number of files to consider when performing rename detection
@@ -63,7 +63,7 @@
Any other value is treated as a custom merge tool and requires
that a corresponding mergetool.<tool>.cmd variable is defined.
-include::mergetools-merge.txt[]
+include::../mergetools-merge.txt[]
merge.verbosity::
Controls the amount of output shown by the recursive merge
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index eb36837..4cc8646 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -342,7 +342,7 @@
CONFIGURATION
-------------
-include::merge-config.txt[]
+include::config/merge.txt[]
branch.<name>.mergeOptions::
Sets default options for merging into branch <name>. The syntax and
