diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-21 13:28:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-21 13:28:48 -0700 |
| commit | 48f662dd74ed9e909a8ba878152f88a238a97b4f (patch) | |
| tree | e938529a6ffce93a8d24273b98ff517d2788456f /t/t7609-merge-co-error-msgs.sh | |
| parent | Merge branch 'da/mergetool-temporary-directory' (diff) | |
| parent | mergetools/meld: make usage of `--output` configurable and more robust (diff) | |
| download | tgif-48f662dd74ed9e909a8ba878152f88a238a97b4f.tar.xz | |
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
Diffstat (limited to 't/t7609-merge-co-error-msgs.sh')
0 files changed, 0 insertions, 0 deletions