Merge algorithms

[Alexander Belchenko]

Martin Pool пишет:
> merge3 merger is the default, and is fast.  lca is probably the best
> choice if you get a warning about criss-cross merges, or if you want a
> bit more power at resolving conflicts, and it should be only
> incrementally slower.

In my experiments weave is more accurate and (in average) produce less 
conflicts than lca in the case of criss-cross. Sometimes lca does better 
job, but it's very rare cases comparing to weave. So, our default 
(internal merge3 algorithm) is very good most of time (90% of cases or 
more). But YMMV, as usual.