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 da/foo

     2

adding foo

     3

% manifest

     4

200 Script output follows

     5

     6

     7

drwxr-xr-x da

     8

-rw-r--r-- 4 foo

     9

    10

    11

200 Script output follows

    12

    13

    14

-rw-r--r-- 4 foo

    15

    16