From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date: Sun, 18 Jan 2009 20:21:01 GMT
Subject: Re: [JGIT PATCH 8/8] Define a basic merge API, and a two-way tree merge strategy
Message-ID: <200901182121.01469.robin.rosenberg.lists@dewire.com>
In-Reply-To: <f299b4f30901171116y216835c9jc11df2d424ee0377@mail.gmail.com>

lördag 17 januari 2009 20:16:21 skrev Tomi Pakarinen:
> testTrivialTwoWay_disjointhistories() failed because merge strategy
> didn't handle missing base
> version. Am'i right?
Kyllä

Or so it seems. My test cases pass. I'll see if I can come up with somehing nasty.
If not I'll apply 

-- robin