diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:36 -0700 |
| commit | 6bbd512374133ff3c1c6b17e080a466b6485ed42 (patch) | |
| tree | c75071a7ac9aeb92d97bb76d82b588bf9753b0f8 /t/t6010-merge-base.sh | |
| parent | Merge branch 'nd/split-index-unshare' (diff) | |
| parent | mergetools/meld: improve compatibiilty with Meld on macOS X (diff) | |
| download | tgif-6bbd512374133ff3c1c6b17e080a466b6485ed42.tar.xz | |
Merge branch 'da/mergetools-meld-output-opt-on-macos'
"git mergetool" learned to work around a wrapper MacOS X adds
around underlying meld.
* da/mergetools-meld-output-opt-on-macos:
mergetools/meld: improve compatibiilty with Meld on macOS X
Diffstat (limited to 't/t6010-merge-base.sh')
0 files changed, 0 insertions, 0 deletions