config.txt: move diff-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 83f5ce90569288b43d40e25ed905bd9c72a327af..5693ce76544691ceead2865d2d2368c32c63b5d0 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -319,7 +319,7 @@ include::config/credential.txt[]
 
 include::config/completion.txt[]
 
-include::diff-config.txt[]
+include::config/diff.txt[]
 
 difftool.<tool>.path::
        Override the path for the given tool.  This is useful in case

diff --git a/Documentation/diff-config.txt b/Documentation/config/diff.txt
similarity index 99%
rename from Documentation/diff-config.txt
rename to Documentation/config/diff.txt
index 85bca83c304c6d95422482b9bc7b8d983bfdc85e..e4db77bc82dfc2576cf02ae392407a0df0728686 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/config/diff.txt
@@ -177,7 +177,7 @@ diff.tool::
        Any other value is treated as a custom diff tool and requires
        that a corresponding difftool.<tool>.cmd variable is defined.
 
-include::mergetools-diff.txt[]
+include::../mergetools-diff.txt[]
 
 diff.indentHeuristic::
        Set this option to `true` to enable experimental heuristics