Merge branch 'maint'

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

Junio C Hamano committed Nov 21, 2011 at 14:30 UTC e14d63198867c545d0662afc00bf7be048bf2231

No changes.