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.

%% Should show unknown
? unknown
removing b
%% Should show unknown and b removed
R b
? unknown
%% Should show a and unknown
a
unknown