Code

documentation fix: git difftool uses diff tools, not merge tools.
authorThomas Hochstein <thh@inter.net>
Mon, 14 Nov 2011 22:55:52 +0000 (23:55 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2011 17:14:34 +0000 (09:14 -0800)
commit1e501a7c47ad5ada53d3b1acfb9f131f76e969ec
tree4250bf0810925d04e1bb4841da0b6b4bc05dc77b
parentbd5bce7cbc55fa52277cc8a39f673c3e2dc60670
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