merge-recursive: Avoid excessive output for and reprocessing of renames