Clemens Buchacher wrote: > Handle file mode changes similarly to changes of content. If the file mode > changed in only one branch, keep the changed version. If the file mode > changed in both branches, prompt the user to choose one by reporting a > conflict. Shouldn't it print "CONFLICT(mode/mode)" then? -- 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
