Re: [PATCH v2 1/2] git-show: fix 'git show -s' to not add extra terminator after merge commit
- From
Max Kirillov <max@max630.net>
- Date
- May 13, 2014, 20:15 UTC
- Message-ID
- <20140513201511.GC6857@wheezy.local>
- In-Reply-To
- <5371B434.7010506@viscovery.net>
On Tue, May 13, 2014 at 07:57:08AM +0200, Johannes Sixt wrote:
Show 11 quoted lines
> 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.
Thank you, will fix it.
-- Max