From 1e501a7c47ad5ada53d3b1acfb9f131f76e969ec Mon Sep 17 00:00:00 2001
From: Thomas Hochstein <thh@inter.net>
Date: Mon, 14 Nov 2011 23:55:52 +0100
Subject: [PATCH] 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>
---
 Documentation/git-difftool.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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