merge-recursive: fix rename/rename(1to2) for working tree with a binary