Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:35:01 +0000 (11:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:35:02 +0000 (11:35 -0700)
commite7cc0ed...1837b6f679e245e29ae3687fc5e6c20d
treef20fa96...ad6afd13fd97cd895bdbc7e173a3c29ecopy hash to clipboard (tree)
parent7e03f41...633b5dbd242d6552e239d50a821262c6copy hash to clipboard (diff)
parentad2f725...b3e93dacd0982a946d30f6595dd8a805copy hash to clipboard (diff)
combine-diff.c