Merge branch 'th/mergetools-deltawalker'

* th/mergetools-deltawalker: Documentation/difftool: add deltawalker to list of valid diff tools
git-mirror · Mar 16, 2012 · 0987145 · 0987145
2 parents c3117b2 + 79e0fe6
commit 0987145
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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