Yesterday Borja and me, were working on some improvements on the merge code. Well, he designed all the most horrible merge scenarios you can think of, or at least some of them.
The image shows a nice and complex version tree with lots of different test cases.
Now we are able to handle multiple merges to a same revision, and solving correctly the common ancestor. We were already solving those cases but with some unsolved issues.