OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c4ffd78
0af85f8
)
Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 10 Jul 2017 20:58:56 +0000
(13:58 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 10 Jul 2017 20:58:56 +0000
(13:58 -0700)
"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
Trivial merge
OSDN Git Service
