| commit | 48f662dd74ed9e909a8ba878152f88a238a97b4f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Oct 2014 20:28:47 +0000 (21 13:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Oct 2014 20:28:48 +0000 (21 13:28 -0700) | ||
| tree | e938529a6ffce93a8d24273b98ff517d2788456f | treesnapshot (tar.gz zip) |
| parent | a46af5946c3ec125e0c2fee889610485eb4a6e14 | commitdiff |
| parent | b12d04503b0aba1f2d68b164b348cbf94bbe570b | commitdiff |
Merge branch 'da/mergetool-meld'
Newer versions of 'meld' breaks the auto-detection we use to see if
they are new enough to support the `--output` option.
* da/mergetool-meld:
mergetools/meld: make usage of `--output` configurable and more robust
Newer versions of 'meld' breaks the auto-detection we use to see if
they are new enough to support the `--output` option.
* da/mergetool-meld:
mergetools/meld: make usage of `--output` configurable and more robust
| Documentation/config.txt | diff1 | diff2 | blobhistory |