diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-15 00:57:17 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-15 00:57:17 +0400 |
| commit | 746b6fb96852accae8a4163f6edda23a4c6de0c7 (patch) | |
| tree | adf9a485ba9e9c2a8c6378edba0b7bf652ca5b0b /gitweb | |
| parent | 63d37c3062e13cb2828edf63bc03cce1b6c41fd0 (diff) | |
| parent | 759a904e090b56a3941c1133a0f3302b7fec5054 (diff) | |
Merge branch 'jn/ancient-meld-support'
* jn/ancient-meld-support:
mergetools/meld: Use --help output to detect --output support
Diffstat (limited to 'gitweb')
0 files changed, 0 insertions, 0 deletions