summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-21 22:30:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-21 22:30:45 (GMT)
commite14d63198867c545d0662afc00bf7be048bf2231 (patch)
tree1557e5d0430cfc807c0f23df891b6cbbf7070ff7
parent0f64a5a3a25c9a161c4e70ae031c885a6284ddb8 (diff)
parent1e501a7c47ad5ada53d3b1acfb9f131f76e969ec (diff)
downloadgit-e14d63198867c545d0662afc00bf7be048bf2231.zip
git-e14d63198867c545d0662afc00bf7be048bf2231.tar.gz
git-e14d63198867c545d0662afc00bf7be048bf2231.tar.bz2
Merge branch 'maint'
* maint: documentation fix: git difftool uses diff tools, not merge tools.
-rw-r--r--Documentation/git-difftool.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index a03515f..19d473c 100644
--- 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.
+