merge-recursive: option to disable renames