![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Feb 2012 23:33:07 +0000 (15:33 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Feb 2012 23:33:07 +0000 (15:33 -0800) | ||
| commit | bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea | |
| tree | 9074c7aa81b7dbd3908132246d6392ef569933d8 | tree | snapshot |
| parent | 4eed30a7cb56dfd21917a3685eccb1d8321d852f | commit | diff |
| parent | 759a904e090b56a3941c1133a0f3302b7fec5054 | commit | diff |
Merge branch 'jn/ancient-meld-support' into maint
* 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