From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 11 Apr 2007 11:32:08 GMT
Subject: Re: Rebase, please help
Message-ID: <81b0412b0704110432o3f861d4aha68df22f88e59da3@mail.gmail.com>
In-Reply-To: <7vr6qrnszb.fsf@assigned-by-dhcp.cox.net>

On 4/11/07, Junio C Hamano <junkio@cox.net> wrote:
> Also there is that small D/F conflict problem merge-recursive
> has that I told you about, which does not exist in git-apply ;-)
> Did you have a chance to take a look at it yet?

not yet. I was greatly distracted by subprojects