Subject: Re: [JGIT PATCH 8/8] Define a basic merge API, and a two-way tree merge strategy

From: Robin Rosenberg <[email-masked]>
Date: Sun, 18 Jan 2009 21:21:01 +0100

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