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.
import doctestimport mercurial.changelog# test doctest from changelogdoctest.testmod(mercurial.changelog)