From: Max Kirillov Date: Mon, 12 May 2014 22:35:18 GMT Subject: [PATCH 0/2] fix 'git show -s' to not add extra terminator after merge commit Message-ID: <20140512223517.GA32205@wheezy.local> * fix the CC issues * add fixes for existing tests Max Kirillov (2): git-show: fix 'git show -s' to not add extra terminator after merge commit t: git-show: adapt tests to fixed 'git show' combine-diff.c | 3 ++- t/t1507-rev-parse-upstream.sh | 2 +- t/t7007-show.sh | 8 ++++++-- t/t7600-merge.sh | 11 +++++------ 4 files changed, 14 insertions(+), 10 deletions(-) -- 1.8.5.2.421.g4cdf8d0