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>
Nguyễn Thái Ngọc Duy committed
Oct 27, 2018 at 08:22 UTC
fa922d74c525a8f66584e50b60b8dfc3cd237a90
2 files changed
+2
-2
Documentation/config.txt
+1
-1
@@ -319,7 +319,7 @@ include::config/credential.txt[]
319
320
include::config/completion.txt[]
321
322
-include::diff-config.txt[]
322
+include::config/diff.txt[]
323
324
difftool.<tool>.path::
325
Override the path for the given tool. This is useful in case
Documentation/config/diff.txt
renamed
+1
-1
@@ -177,7 +177,7 @@ diff.tool::
177
Any other value is treated as a custom diff tool and requires
178
that a corresponding difftool.<tool>.cmd variable is defined.
179
180
-include::mergetools-diff.txt[]
180
+include::../mergetools-diff.txt[]
181
182
diff.indentHeuristic::
183
Set this option to `true` to enable experimental heuristics