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.
abort: error: Connection refused255copy: No such file or directoryabort: HTTP Error 4040