![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Nov 2011 22:30:45 +0000 (14:30 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Nov 2011 22:30:45 +0000 (14:30 -0800) | ||
| commit | e14d63198867c545d0662afc00bf7be048bf2231 | |
| tree | 1557e5d0430cfc807c0f23df891b6cbbf7070ff7 | tree | snapshot |
| parent | 0f64a5a3a25c9a161c4e70ae031c885a6284ddb8 | commit | diff |
| parent | 1e501a7c47ad5ada53d3b1acfb9f131f76e969ec | commit | diff |
Merge branch 'maint'
* maint:
documentation fix: git difftool uses diff tools, not merge tools.
* maint:
documentation fix: git difftool uses diff tools, not merge tools.