Comment 19 for bug 40412

Hello John. Ignoring bug#494197, I continued my tests.

1) using the same weave merge as the one I described in a previous post ("frazer" into "sp1r-tomas"), I checked a few text-conflicted files, comparing:
- the file with its inline TREE/MERGE-SOURCE markers
- the merge done by "bzr extmerge" (using kdiff3) which uses the BASE/OTHER/THIS files (BASE being the one which your branch nicely produces).
They produce similar results, which suggests that your new BASE file looks good.
A detail: I could observe that when the inline-markers file shows a conflict, sometimes extmerge/kdiff3 would automerge correctly, and sometimes extmerge/kdiff3 would automerge wrongly (which is the worse thing for us - it introduces bugs silently). It's not a problem in bzr as extmerge/xxdiff does find a conflict (so it's rather a problem in kdiff3, which I reported to the maintainer).

2) I did a big merge (133 conflicted files) of two other trees, which was *not* criss-cross; I see merge3 and weave give the same BASE files with same content, which is good.