merge-recursive: Delay handling of rename/delete conflicts