Merge branch 'jk/pretty-empty-format'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Sep 2014 20:25:03 +0000 (13:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Sep 2014 20:25:04 +0000 (13:25 -0700)
commit44ceb79...84b0f339147d2d44e4bb50cc472be03e
tree207c1f0...269f9d99602ae9043ad6a259428a9831copy hash to clipboard (tree)
parent56f214e...716dec043b50a7e1e8cc181be2ef7df2copy hash to clipboard (diff)
parentb9c7d6e...330e3dcdb3b3e5f013e5667e47555c95copy hash to clipboard (diff)
combine-diff.c