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)
commit1e501a7...47ad5ada53d3b1acfb9f131f76e969ec
tree4250bf0...10925d04e1bb4841da0b6b4bc05dc77bcopy hash to clipboard (tree)
parentbd5bce7...bc55fa52277cc8a39f673c3e2dc60670copy hash to clipboard (diff)
Documentation/git-difftool.txt