From: Thomas Hochstein <thh@inter.net>
Date: Mon, 14 Nov 2011 22:55:52 +0000 (+0100)
Subject: documentation fix: git difftool uses diff tools, not merge tools.
X-Git-Tag: v1.7.8-rc4~8^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1e501a7c47ad5ada53d3b1acfb9f131f76e969ec;p=git.git

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>
---

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.
 +