Merge branch 'ar/diff-args-osx-precompose' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2016 21:27:35 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2016 21:27:35 +0000 (14:27 -0700)
commit05781d3...fa43b5dada77d1bcfd4cdc42742e7421
tree671bb97...46944b084b878192bc3464bd5c13b1cbcopy hash to clipboard (tree)
parent4b0891f...e4ec3aef081cf48c5f9a747586076f7acopy hash to clipboard (diff)
parent90a78b8...e0b812d1f42501a54372720def4ddd84copy hash to clipboard (diff)
builtin/diff-tree.c
builtin/diff.c