Stefan Reichör <[EMAIL PROTECTED]> writes: > We should perhaps change the default to 'update.
"merge" has the big advantage of being able to report conflicts as inline markers (but that's not mandatory). That's what most people want, and in particular, that's what beginners want, so, I think that's a reasonable default. There are corner-cases where update is better, but the expert user can choose. > Because that is available for tla and baz. "merge" is also available for tla, it's just called "star-merge", and a bit less powerfull. (see above message, I'll fix this) -- Matthieu
