Masatake YAMATO <[EMAIL PROTECTED]> writes: > "merge" is used widely in xtla-1.2. > However, I think it should be "merges".
This is because you are using an old-fashion revision control system ;-). In Bazaar, "star-merge" has been extended and renamed to "merge". Normally, Xtla autodetects the presence of "merge" and choses between "merge" and "star-merge". It seems it doesn't in the example you pointed out, I'll fix this. Anyway, this has nothing to do with "merges". -- Matthieu
