Hi, On Sat, 25 Mar 2006, Mark Wooding wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > > I am nowhere near kernel people, but I am using git on a machine where it > > is too cumbersome to install python. If git-resolve goes, I am without a > > merge strategy (at least until git-recursive is ported to C... was that > > not the plan with git-merge-tree? What happened on that front?). > > Err... git-resolve isn't the same as git-merge-resolve. Oooops. Thank you, 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