merge-recursive: mark rename/delete conflict as unmerged