merge-recursive: don't detect renames of empty files