aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hochstein <thh@inter.net>2011-11-14 23:55:52 +0100
committerJunio C Hamano <gitster@pobox.com>2011-11-21 09:14:34 -0800
commit1e501a7c47ad5ada53d3b1acfb9f131f76e969ec (patch)
tree4250bf0810925d04e1bb4841da0b6b4bc05dc77b
parentbd5bce7cbc55fa52277cc8a39f673c3e2dc60670 (diff)
downloadgit-1e501a7c47ad5ada53d3b1acfb9f131f76e969ec.tar.gz
git-1e501a7c47ad5ada53d3b1acfb9f131f76e969ec.tar.xz
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>
-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 a03515f1e..19d473c07 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.
+