merge-recursive: distinguish "removed" and "overwritten" messages