From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Nov 2011 22:30:45 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.8-rc4~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e14d63198867c545d0662afc00bf7be048bf2231?ds=inline;hp=--cc

Merge branch 'maint'

* maint:
documentation fix: git difftool uses diff tools, not merge tools.
---

e14d63198867c545d0662afc00bf7be048bf2231