Merge branch 'mk/show-s-no-extra-blank-line-for-merges'

* mk/show-s-no-extra-blank-line-for-merges: git-show: fix 'git show -s' to not add extra terminator after merge commit

Junio C Hamano committed Jun 6, 2014 at 11:35 UTC e7cc0ede1837b6f679e245e29ae3687fc5e6c20d

No changes.