author | Junio C Hamano <gitster@pobox.com> | |
Mon, 21 Nov 2011 22:30:45 +0000 (14:30 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 21 Nov 2011 22:30:45 +0000 (14:30 -0800) |
* maint:
documentation fix: git difftool uses diff tools, not merge tools.
documentation fix: git difftool uses diff tools, not merge tools.
Documentation/git-difftool.txt | patch | blob | history |
index a03515f1eccddded2efbd46ca522f3bac8896d90..19d473c070c4f82dc4b7f04f784bcae835dca6a2 100644 (file)
-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.
+