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)
* mk/show-s-no-extra-blank-line-for-merges:
git-show: fix 'git show -s' to not add extra terminator after merge commit

No differences found