Re: The new Codeville merge algorithm

Bram Cohen wrote:
> Once we have a full ordering, merge becomes surprisingly
> easy. Simply combine line states, and pull out all lines from the
> list.

Does this mean that you only have minimal context?  That is, if you have

  A
 / \
B   C

A=abc
B=aXbc
C=abYc

then you get a clean merge of

aXbYc

That seems troubling, especially if line "b" is a blank line.

Cheers,
Walter