Hi, On Thu, 29 Jun 2006, Alex Riesen wrote: > On 6/29/06, Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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? Darn. Yes. Sorry for the noise. Ciao, Dscho - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html