-
Volker Krause authored
This is almost the same, but the merge method does handle a few special cases where we know which side is "better".
bd9ebf77
This is almost the same, but the merge method does handle a few special cases where we know which side is "better".