[Gnu-arch-users] tla apply-changeset --three-way ??

[Zenaan Harkness]

Is there a patch/plan for apply-changeset "--three-way" option?

I just ran through one of the "star-merge undo" techniques, and realised
that now I've got this annoying .rej file, rather than inline diffs, and
I still don't know how to edit this effectively.

Is it possible to manually apply the .rej file, to the original (.java)
file, so that I end up with the inline <<<<, ====, >>>> markers ??

tia
zen