merge-recursive: fix rename handling