diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-27 15:33:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-27 15:33:07 -0800 |
| commit | bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea (patch) | |
| tree | 9074c7aa81b7dbd3908132246d6392ef569933d8 /gitweb | |
| parent | 4eed30a7cb56dfd21917a3685eccb1d8321d852f (diff) | |
| parent | 759a904e090b56a3941c1133a0f3302b7fec5054 (diff) | |
| download | git-bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea.tar.gz | |
Merge branch 'jn/ancient-meld-support' into maint
* jn/ancient-meld-support:
mergetools/meld: Use --help output to detect --output support
Diffstat (limited to 'gitweb')
0 files changed, 0 insertions, 0 deletions