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
mkfifo p

hg serve --stdio < p &
P=$!
(echo lock; echo addchangegroup; sleep 5) > p &
Q=$!
sleep 3
kill -HUP $P
wait
echo .hg/* .hg/store/*