projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c4ffd78 0af85f8)
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)
commit311b760b8f158fe9db633301469ab4b58447542f
treefbdba9d1df38d6a176431ae6cafb1a282d3d21c2tree | snapshot
parentc4ffd788528dda0078b4db234b43e8fd08d232d0commit | diff
parent0af85f84bd6d1755b3b8559ccfd99383c2928ac3commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.