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
echo 'raise Exception("bit bucket overflow")' > badext.py
abspath=`pwd`/badext.py
echo '[extensions]' >> $HGRCPATH
echo "gpg =" >> $HGRCPATH
echo "hgext.gpg =" >> $HGRCPATH
echo "badext = $abspath" >> $HGRCPATH
hg -q help help