documentation fix: git difftool uses diff tools, not merge tools.
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>
Thomas Hochstein committed
Nov 14, 2011 at 23:55 UTC
1e501a7c47ad5ada53d3b1acfb9f131f76e969ec
1 file changed
+1
-1
Documentation/git-difftool.txt
+1
-1
@@ -31,7 +31,7 @@ OPTIONS
31
-t <tool>::
32
--tool=<tool>::
33
Use the diff tool specified by <tool>.
34
- Valid merge tools are:
34
+ Valid diff tools are:
35
araxis, bc3, diffuse, emerge, ecmerge, gvimdiff, kdiff3,
36
kompare, meld, opendiff, p4merge, tkdiff, vimdiff and xxdiff.
37
+