Aaron Bentley <[EMAIL PROTECTED]> wrote: > Deliverable Mail wrote: >> If tla were to check that the result of aplying file.rej to the last >> commit would indeed yield the file <=> file.orig, perhaps it might see >> there's no conflict and not bother with it? > > tla can use --three-way for star-merge, which will handle such > situations gracefully.
Isn't star-merge --three-way using diff3 as the merging tool? AFAIK, diff3 reports a conflict for this situation (or am I missing some options passed to diff3?) -- Catalin _______________________________________________ Gnu-arch-users mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
