Hi, On Fri, 24 Mar 2006, Junio C Hamano wrote: > If nobody in the upper echelon of kernel people (meaning, longest-time > git users) use git-resolve anymore, I think we should mark it deprecated > and remove it eventually. 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?). 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