merge-recursive: fix leaks of allocated renames and diff_filepairs