documentation fix: git difftool uses diff tools, not merge tools.
authorThomas Hochstein <thh@inter.net>
Mon, 14 Nov 2011 22:55:52 +0000 (23:55 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2011 17:14:34 +0000 (09:14 -0800)
Let the documentation for -t list valid *diff* tools,
not valid *merge* tools.

Signed-off-by: Thomas Hochstein <thh@inter.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-difftool.txt

index a03515f1eccddded2efbd46ca522f3bac8896d90..19d473c070c4f82dc4b7f04f784bcae835dca6a2 100644 (file)
@@ -31,7 +31,7 @@ OPTIONS
 -t <tool>::
 --tool=<tool>::
        Use the diff tool specified by <tool>.
-       Valid merge tools are:
+       Valid diff tools are:
        araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
        kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
 +