![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Feb 2012 20:57:17 +0000 (12:57 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Feb 2012 20:57:17 +0000 (12:57 -0800) |
* jn/ancient-meld-support:
mergetools/meld: Use --help output to detect --output support
mergetools/meld: Use --help output to detect --output support
Trivial merge