![[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) | ||
| commit | 746b6fb96852accae8a4163f6edda23a4c6de0c7 | |
| tree | adf9a485ba9e9c2a8c6378edba0b7bf652ca5b0b | tree | snapshot |
| parent | 63d37c3062e13cb2828edf63bc03cce1b6c41fd0 | commit | diff |
| parent | 759a904e090b56a3941c1133a0f3302b7fec5054 | commit | diff |
Merge branch 'jn/ancient-meld-support'
* jn/ancient-meld-support:
mergetools/meld: Use --help output to detect --output support
* jn/ancient-meld-support:
mergetools/meld: Use --help output to detect --output support