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.
baz can use --three-way for merge and apply-delta.
At least I'd love to see an option to tell it that's the case, --auto-resolve-identical or something.
See the recent discussion of --forward where I described how to code that.
Aaron -- Aaron Bentley Director of Technology Panometrics, Inc.
_______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users
GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
