From: Tim Henigan Date: Thu, 15 Mar 2012 16:28:26 +0000 (-0400) Subject: Documentation/difftool: add deltawalker to list of valid diff tools X-Git-Tag: v1.7.10-rc2~7^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=79e0fe634865462551cf3fcad25c9a595652e925;p=git.git Documentation/difftool: add deltawalker to list of valid diff tools 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 19d473c07..fe38f667f 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -32,8 +32,9 @@ OPTIONS --tool=:: Use the diff tool specified by . 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