From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 29 Jun 2006 14:12:38 GMT
Subject: Re: [PATCH] move get_merge_bases() to core lib; use it in merge-recursive
Message-ID: <81b0412b0606290712h4960ee8et7ea219d4dd6428b4@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.63.0606291519440.29667@wbgn013.biozentrum.uni-wuerzburg.de>

On 6/29/06, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Aargh! Of course this is [PATCH 2/2]. BTW, no signoff, since the whole
> merge-recursive is not mergeable yet (passes the tests, but we have a
> small way to go).

How did you get it to pass the tests? Maybe you still have git-merge-recursive
as default merge strategy?