From: Johan Herland <johan@herland.net>
Date: Sun, 25 Jul 2010 18:58:02 GMT
Subject: Re: [WIP/RFC 12/13] git notes merge: Add automatic conflict resolvers (ours, theirs, union)
Message-ID: <201007252058.02964.johan@herland.net>
In-Reply-To: <4C4AA1C3.8030907@gmail.com>

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@herland.net>
www.herland.net