Matthieu Moy <[EMAIL PROTECTED]> writes: > 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.
The place where I use it often is the *missing* buffer. There we have the commands * M u : update * M s : star-merge When tla-update-strategy is not update, the M u command runs that instead. That was confusing for me. That was also the reason for me to set that variable to 'update. >> 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) Stefan.
