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
hg init
echo "Is there an error message when trying to diff non-existing files?"
hg diff not found
echo "Is there an error message when trying to add non-existing files?"
hg add not found