"Tom Hansen" <[EMAIL PROTECTED]> writes: > I use "tla replay" instead of "tla update" to > avoid this problem. The replay command does not > peroform the undo/redo cycle.
"star-merge" (or "baz merge") also avoids the problem, and has the advantage of being able to perform a three-way-merge (Whereas the replay command's behavior of stopping at the first conflict can be somewhat confusing). -- Matthieu _______________________________________________ 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/
