]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6ba4d62 0af85f8)
Merge branch 'da/mergetools-meld-output-opt-on-macos'
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:36 +0000 (14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:36 +0000 (14:28 -0700)
commit6bbd512374133ff3c1c6b17e080a466b6485ed42
treec75071a7ac9aeb92d97bb76d82b588bf9753b0f8tree | snapshot
parent6ba4d62ba8fb00310df6e6cc0d4437871106c5edcommit | diff
parent0af85f84bd6d1755b3b8559ccfd99383c2928ac3commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.