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.lorimer.id.au/gitweb.git/diff_plain/1e501a7c47ad5ada53d3b1acfb9f131f76e969ec?ds=inline;hp=1e501a7c47ad5ada53d3b1acfb9f131f76e969ec

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