Skip to content

Commit

Permalink
documentation fix: git difftool uses diff tools, not merge tools.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Hochstein authored and Junio C Hamano committed Nov 21, 2011
1 parent bd5bce7 commit 1e501a7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/git-difftool.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
+
Expand Down

0 comments on commit 1e501a7

Please sign in to comment.