On Fri, Oct 03, 2008 at 05:09:27PM +0200, SZEDER Gábor <szeder@xxxxxxxxxx> wrote: > I think this should be squashed onto Miklós' patch. I'll resend a squashed patch with your signoff included. > I'm not sure about putting these two new test into t7600-merge.sh. > Although the infrastructure to keep these tests very short (repo with > branches already set up, verify_parents) is there available, the first > test tests not only merge, but the cooperation of merge and commit, > and this second one tests only commit. Given that originally it was git-merge.sh that did this reduction, I think it's OK.
Attachment:
pgpZD7OmZjbMP.pgp
Description: PGP signature
