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.

#!/bin/sh

hg init a
cd a
hg -v log -v
hg -v log -v x
true