git-show: fix 'git show -s' to not add extra terminator after merge commit