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.

     1

adding a

     2

Now at: a.patch

     3

applying b.patch

     4

applying c.patch

     5

Now at: c.patch

     6

Now at: b.patch