Merge branch 'maint'
commite14d63198867c545d0662afc00bf7be048bf2231
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2011 22:30:45 +0000 (21 14:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Nov 2011 22:30:45 +0000 (21 14:30 -0800)
tree1557e5d0430cfc807c0f23df891b6cbbf7070ff7
parent0f64a5a3a25c9a161c4e70ae031c885a6284ddb8
parent1e501a7c47ad5ada53d3b1acfb9f131f76e969ec
Merge branch 'maint'

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