Skip to content

Commit 21e1b44

Browse files
adamchainzgitster
authored andcommitted
difftool docs: restore correct position of tool list
2a9dfdf (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>
1 parent a60673e commit 21e1b44

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Documentation/config/diff.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ endif::git-diff[]
218218
Set this option to `true` to make the diff driver cache the text
219219
conversion outputs. See linkgit:gitattributes[5] for details.
220220

221-
include::{build_dir}/mergetools-diff.txt[]
222-
223221
`diff.indentHeuristic`::
224222
Set this option to `false` to disable the default heuristics
225223
that shift diff hunk boundaries to make patches easier to read.

Documentation/config/difftool.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ diff.guitool::
1313
and requires that a corresponding difftool.<guitool>.cmd variable
1414
is defined.
1515

16+
include::{build_dir}/mergetools-diff.txt[]
17+
1618
difftool.<tool>.cmd::
1719
Specify the command to invoke the specified diff tool.
1820
The specified command is evaluated in shell with the following

0 commit comments

Comments
 (0)