From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:58:56 +0000 (-0700)
Subject: Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint
X-Git-Tag: v2.13.3~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/311b760b8f158fe9db633301469ab4b58447542f?hp=--cc

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
---

311b760b8f158fe9db633301469ab4b58447542f