Stefan Reichör <[EMAIL PROTECTED]> writes:

> When tla-update-strategy is not update, the M u command runs that
> instead.

It's a different command, but the way it is called, it has the same
effect. "merge" is different from update only when called with an
argument. Otherwise, both update to the latest revision in the branch,
preserving local changes.

-- 
Matthieu

Reply via email to