Code

Documentation/difftool: add deltawalker to list of valid diff tools
authorTim Henigan <tim.henigan@gmail.com>
Thu, 15 Mar 2012 16:28:26 +0000 (12:28 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Mar 2012 20:53:39 +0000 (13:53 -0700)
deltawalker has been supported since 284a126c3ef3, 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>
Documentation/git-difftool.txt

index 19d473c070c4f82dc4b7f04f784bcae835dca6a2..fe38f667f9cd232c3c7a8bc7653648995b3ce4aa 100644 (file)
@@ -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