| commit | 28aca314b3ebd8c3a5c11bab7520e0a15e8935cd | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Feb 2012 19:53:24 +0000 (13 11:53 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Feb 2012 19:53:24 +0000 (13 11:53 -0800) | ||
| tree | 02b90f0073cae124d5aefb8d1e44636f80d20e2e | treesnapshot (tar.gz zip) |
| parent | 307ddf6cbbe49da06057c1c50a8ad28b6a7ec1e3 | commitdiff |
| parent | 759a904e090b56a3941c1133a0f3302b7fec5054 | commitdiff |
Merge branch 'jn/ancient-meld-support' into next
* 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