The fix for
Item1897 has introduced a new serious bug.
The merge itself duplicates a lot of the content screwing up the topic completely.
Also. The reported saved version number when the merging user saves is still one behind.
The merge error is so seriously affecting the use that I classify it as requirement.
The test case is the good old Aedit Asave Bedit Aedit Asave Bsave
But each time I actually write something in the topic. I start with a topic with some text. And then I make A write above the old text and B write below the old text so in principle the merge should be easy and perfect.
But when you go back to the A and reload the page a lot of the text is duplicated.
KJL
Was caused by an unintentional paste.
SVN 9417
CC
Closed with release of 4.0.2
KJL