merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
3210 files updated, 0 files merged, 1 files removed, 0 files unresolvedsub/b not presentsub not present