[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: TLA Replay nastiness
|
From: |
Matthieu Moy |
|
Subject: |
[Gnu-arch-users] Re: TLA Replay nastiness |
|
Date: |
Thu, 10 Nov 2005 09:40:01 +0100 |
|
User-agent: |
Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) |
"Tom Hansen" <address@hidden> 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