From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 24 Jun 2017 21:28:36 +0000 (-0700)
Subject: Merge branch 'da/mergetools-meld-output-opt-on-macos'
X-Git-Tag: v2.14.0-rc0~69
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6bbd512374133ff3c1c6b17e080a466b6485ed42

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

6bbd512374133ff3c1c6b17e080a466b6485ed42