difftool docs: restore correct position of tool list
2a9dfdf260 (difftool docs: de-duplicate configuration sections, 2022-09-07) moved the difftool documentation, but missed moving this "include" line that includes the generated list of diff tools, as referenced in the moved text. Restore the correct position of the included list. Signed-off-by: Adam Johnson <me@adamj.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Adam Johnson committed
Jan 8, 2025 at 23:35 UTC
21e1b4486586d3a15d2d7bf0479e77636359b816
2 files changed
+2
-2
Documentation/config/diff.txt
-2
@@ -218,8 +218,6 @@ endif::git-diff[]
218
Set this option to `true` to make the diff driver cache the text
219
conversion outputs. See linkgit:gitattributes[5] for details.
220
221
-include::{build_dir}/mergetools-diff.txt[]
222
-
221
`diff.indentHeuristic`::
222
Set this option to `false` to disable the default heuristics
223
that shift diff hunk boundaries to make patches easier to read.
Documentation/config/difftool.txt
+2
@@ -13,6 +13,8 @@ diff.guitool::
13
and requires that a corresponding difftool.<guitool>.cmd variable
14
is defined.
15
16
+include::{build_dir}/mergetools-diff.txt[]
17
+
18
difftool.<tool>.cmd::
19
Specify the command to invoke the specified diff tool.
20
The specified command is evaluated in shell with the following