From: Johannes Sixt Date: Tue, 13 May 2014 05:57:08 GMT Subject: Re: [PATCH v2 1/2] git-show: fix 'git show -s' to not add extra terminator after merge commit Message-ID: <5371B434.7010506@viscovery.net> In-Reply-To: <20140512231029.GD32316@wheezy.local> Am 5/13/2014 1:10, schrieb Max Kirillov: > --- a/t/t7007-show.sh > +++ b/t/t7007-show.sh > @@ -25,6 +25,7 @@ test_expect_success 'set up a bit of history' ' > git checkout -b side HEAD^^ && > test_commit side2 && > test_commit side3 > + test_merge merge main3 > ' Broken &&-chain. -- Hannes