Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:58:56 +0000 (13:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:58:56 +0000 (13:58 -0700)
commit311b760...8f158fe9db633301469ab4b58447542f
treefbdba9d...df38d6a176431ae6cafb1a282d3d21c2copy hash to clipboard (tree)
parentc4ffd78...528dda0078b4db234b43e8fd08d232d0copy hash to clipboard (diff)
parent0af85f8...bd6d1755b3b8559ccfd99383c2928ac3copy hash to clipboard (diff)