Skip to content

Commit 79e0fe6

Browse files
thenigangitster
authored andcommitted
Documentation/difftool: add deltawalker to list of valid diff tools
deltawalker has been supported since 284a126, but was not added to the list of valid diff tools reported by 'git difftool --help'. Signed-off-by: Tim Henigan <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 284a126 commit 79e0fe6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Documentation/git-difftool.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ OPTIONS
3232
--tool=<tool>::
3333
Use the diff tool specified by <tool>.
3434
Valid diff tools are:
35-
araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
36-
kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
35+
araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff,
36+
kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and
37+
xxdiff.
3738
+
3839
If a diff tool is not specified, 'git difftool'
3940
will use the configuration variable `diff.tool`. If the

0 commit comments

Comments
 (0)