Alex Riesen wrote: > The result seem to be at least predictable. Still, doesn't it mean > that once a rename/rename conflict is in it has to be resolved > manually forever? What about git-rerere2 idea (recording resolving of tree-level conflicts, i.e. rename/rename and such)? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - To unsubscribe from this list: 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