Merge branch 'th/mergetools-deltawalker'

* th/mergetools-deltawalker:
  Documentation/difftool: add deltawalker to list of valid diff tools

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 19d473c070c4f82dc4b7f04f784bcae835dca6a2..fe38f667f9cd232c3c7a8bc7653648995b3ce4aa 100644 (file)
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -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