1/22 /csua/bin/motdedit upgraded: auto-merge feature installed.
motdedit -h for details.
Note: motdedit will automerge, "motdedit -m" turns automerge off.
\_ brief description: If someone else changed motd.public as you
were editing, it attempts to merge. So far, I've only seen it
have problems when both of you have changed the same lines.
If this happens, it prompts you to manually merge(restarting
editor), if you pass, then you have the option of overwriting.
any complaints, comments, etc.: post here or mail me -nivra
\_ Which means that if we don't use motdedit, then motdedit users
won't stomp on us. Great!
\_ umm... the whole *point* is so that motdedit users will
not stomp on any other posts. The only situation where
a possible stomp occurs is when you and the motdedit user
edits the exact same lines. In that case, the motdedit
user has the option of re-editing both posts together, or
just keeping his own changes, or discarding his own changes. |