-
Volker Krause authored
This avoids dropping potential action lists during merging if only one side has one. This still needs a more comprehensive solution to deal with both sides having different action lists though.
15a7f62a
This avoids dropping potential action lists during merging if only one side has one. This still needs a more comprehensive solution to deal with both sides having different action lists though.