X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-difftool.txt;h=590f410abf0b902160eca0e92888191a2e2a0b89;hb=c5bcbcdcfa1e2a1977497cb3a342c0365c8d78d6;hp=a5d9c121f1b0398413814e8bc68fdb3bd3bf3c2b;hpb=674ef90904fe651ecacafc4211a8a24014160207;p=git.git

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index a5d9c121f..590f410ab 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -31,8 +31,8 @@ OPTIONS
 --tool=<tool>::
 	Use the diff tool specified by <tool>.
 	Valid merge tools are:
-	kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
-	ecmerge, diffuse, opendiff, p4merge and araxis.
+	araxis, bc3, 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