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.
adding bar
adding foo
adding bomb
adding a.c
adding dir/a.o
adding dir/b.o
M dir/b.o
! a.c
! dir/a.o
? .hgignore
a.c: unsupported file type (type is fifo)
! a.c
# test absolute path through symlink outside repo
A f
# try symlink outside repo to file inside
abort: ../z not under root
# try cloning symlink in a subdir
1. commit a symlink
? a/b/c/demo
adding a/b/c/demo
2. clone it
1 files updated, 0 files merged, 0 files removed, 0 files unresolved