Paul Jackson <[EMAIL PROTECTED]> wrote: >> "merge" does a better job than "diff3" since it can resolve the > > The merge command I know of is part of Tichy's RCS tools, > and calls diff3, and has no inherent superior abilities.
You are right, I missed some diff3 options. It looks like "diff3 -mE" generates the same output as "merge" (i.e. solving the identical changes in the derived files). Sorry for the noise :-) -- Catalin - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
