Hi, On Tue, 14 Mar 2006, Mark Hollomon wrote: > git-pull is hardcoded to use the recursive merge strategy > for the twohead case. But if git has been built with NO_PYTHON, > that strategy is not available. Teach git-pull to use resolve > if built with NO_PYTHON. D'oh. I forgot to send that patch when I was doing the NO_PYTHON stuff. But I did it differently: There is no good reason that git-pull should insist on its own default strategy when git-merge already has one. 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