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.
#!/bin/sh
# test command parsing and dispatch
hg init a
cd a
echo a > a
hg ci -Ama -d '0 0'
echo "# missing arg"
hg cat
echo '% [defaults]'
hg cat a
cat > $HGRCPATH <<EOF
[defaults]
cat = -v
EOF
hg cat a
echo '% no repo'
cd ..
hg cat
exit 0