| commit | 6bbd512374133ff3c1c6b17e080a466b6485ed42 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 24 Jun 2017 21:28:36 +0000 (24 14:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 24 Jun 2017 21:28:36 +0000 (24 14:28 -0700) | ||
| tree | c75071a7ac9aeb92d97bb76d82b588bf9753b0f8 | treesnapshot (tar.gz zip) |
| parent | 6ba4d62ba8fb00310df6e6cc0d4437871106c5ed | commitdiff |
| parent | 0af85f84bd6d1755b3b8559ccfd99383c2928ac3 | commitdiff |
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
"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