From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sat, 27 Oct 2018 06:22:51 +0000 (+0200)
Subject: config.txt: move diff-config.txt to config/
X-Git-Tag: v2.20.0-rc0~59^2~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa922d74c525a8f66584e50b60b8dfc3cd237a90;p=thirdparty%2Fgit.git

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 83f5ce9056..5693ce7654 100644
--- 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 85bca83c30..e4db77bc82 100644
--- 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