> But there *is* a conflict. Maybe you *want* the line to be added twice. > How should tla know?
Well, diff3 knows that it shouldn't be considered as a conflict.
So, just use "tla star-merge --three-way" and those conflicts
will be resolved safely for you.
Stefan
_______________________________________________
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/
