diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:58:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:58:56 -0700 |
| commit | 311b760b8f158fe9db633301469ab4b58447542f (patch) | |
| tree | fbdba9d1df38d6a176431ae6cafb1a282d3d21c2 /commit.c | |
| parent | Merge branch 'jk/diff-highlight-module' into maint (diff) | |
| parent | mergetools/meld: improve compatibiilty with Meld on macOS X (diff) | |
| download | git-311b760b8f158fe9db633301469ab4b58447542f.tar.gz git-311b760b8f158fe9db633301469ab4b58447542f.zip | |
Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint
"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 'commit.c')
0 files changed, 0 insertions, 0 deletions