Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
---
Documentation/config.txt | 2 +-
Documentation/{diff-config.txt => config/diff.txt} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename Documentation/{diff-config.txt => config/diff.txt} (99%)
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
--
2.19.1.647.g708186aaf9
