Merge branch 'jk/pretty-empty-format' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:05:09 +0000 (14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:05:09 +0000 (14:05 -0700)
commit723361a...72e8c9fe93f00b17a1f4ed02585923b2
tree7479c01...c8f1a008558b68c252733096b47aec11copy hash to clipboard (tree)
parent96db324...73fdada6fbe7b63221986f8f18cc63b0copy hash to clipboard (diff)
parentb9c7d6e...330e3dcdb3b3e5f013e5667e47555c95copy hash to clipboard (diff)
combine-diff.c