From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:35:01 +0000 (-0700)
Subject: Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
X-Git-Tag: v2.1.0-rc0~154
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e7cc0ede1837b6f679e245e29ae3687fc5e6c20d?hp=e7cc0ede1837b6f679e245e29ae3687fc5e6c20d

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
---