Hi, On Wed, 18 Oct 2006, Jakub Narebski wrote: > 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)? We have only half of libxdiff, lacking the patch functionality. And AFAIUI the minimal implementation of diff3 in xdiff just uses a diff of the first pair on the third file (or some other order). So, it is not really a diff3/merge: it would fail in fairly trivial cases. Ciao, Dscho P.S.: Davide, correct me if I'm wrong.