Uwe Zeisberger wrote: > If no error occurs, merge (from rcs 5.7) is nothing but: > > diff3 -E -am -L label1 -L label2 -L label3 file1 file2 file3 > tmpfile > cat tmpfile > file1 > > Using diff3 directly saves one fork per conflicting file. Doesn't xdiff library git uses have diff3/merge equivalent? Couldn't we use that instead (on less dependency, better performance)? -- 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