Merge branch 'ar/diff-args-osx-precompose'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2016 21:54:35 +0000 (14:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 May 2016 21:54:35 +0000 (14:54 -0700)
commit53c4b3e...0e4c43fcd95473733b61e560ee21b4bc
tree744a524...a62b998b58a1aa8702603cf47b6d76e2copy hash to clipboard (tree)
parentfa4f29b...a8febd454fb589f96afa014d73f157c1copy hash to clipboard (diff)
parent90a78b8...e0b812d1f42501a54372720def4ddd84copy hash to clipboard (diff)
builtin/diff-tree.c
builtin/diff.c