On Saturday 24 July 2010, Stephen Boyd wrote: > On 07/23/2010 03:15 AM, Johan Herland wrote: > > + > > +# Set up a notes merge scenario with all kinds of potential conflicts > > +test_expect_success 'setup commits' ' > > + # Create 15 commits with tags ("1st" through "15th") > > [...] > > Can you use test_commit here? Yes, indeed. Thanks for noticing. I've rewritten the tests using test_commit (and using variables to store commit SHA1s, so that the tests are more robust against those changing) ...Johan -- Johan Herland, <johan@xxxxxxxxxxx> www.herland.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html