Merge branch 'mk/show-s-no-extra-blank-line-for-merges' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:49:39 +0000 (11:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:49:39 +0000 (11:49 -0700)
commit85785df...d6db50ff37d0ff1878c16ad69a063f6a
tree795c85b...b9254583286d5cb08a43f33e63509e87copy hash to clipboard (tree)
parentd9036cd...8c9b115fe38e2f629292f2ddf60fb805copy hash to clipboard (diff)
parentad2f725...b3e93dacd0982a946d30f6595dd8a805copy hash to clipboard (diff)
combine-diff.c