mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Documentation/difftool: add deltawalker to list of valid diff tools
deltawalker has been supported since 284a126c3e
, but was not added
to the list of valid diff tools reported by 'git difftool --help'.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
284a126c3e
commit
79e0fe6348
|
@ -32,8 +32,9 @@ OPTIONS
|
|||
--tool=<tool>::
|
||||
Use the diff tool specified by <tool>.
|
||||
Valid diff tools are:
|
||||
araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
|
||||
kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
|
||||
araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff,
|
||||
kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and
|
||||
xxdiff.
|
||||
+
|
||||
If a diff tool is not specified, 'git difftool'
|
||||
will use the configuration variable `diff.tool`. If the
|
||||
|
|
Loading…
Reference in a new issue