Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2011 22:30:45 +0000 (14:30 -0800)
committerJunio 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/git-difftool.txt patch | blob | history
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index a03515f1eccddded2efbd46ca522f3bac8896d90..19d473c070c4f82dc4b7f04f784bcae835dca6a2 100644 (file)
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -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.
 +