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.
changeset: 0:9426b370c206
tag: tip
user: My Name <myname@example.com>
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-1
changeset: 1:4997f15a1b24
tag: tip
user: foo@bar.com
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-1
changeset: 2:72b8012b424e
tag: tip
user: foobar <foo@bar.com>
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-1
changeset: 3:35ff3067bedd
tag: tip
user: foo@bar.com
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-1
abort: Please specify a username.
transaction abort!
rollback completed
No username found, using user@host instead