kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Thomas Hochstein 2011-11-14 23:55:52 +01:00 committed by Junio C Hamano
parent bd5bce7cbc
commit 1e501a7c47
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-difftool.txt
View File

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