Comment 8 for bug 562669

Revision history for this message
Vincent Ladeuil (vila) wrote :

'b' disappears because it's not involved in a conflict anymore.

So --reprocess --show-base could give:

a
<<<<
d
|||||
=====
x
>>>>>
e
f
<<<<<
|||||
=====
y
>>>>>
c