view tests/test-issue352 @ 4682:dc5920ea12f8

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
# http://www.selenic.com/mercurial/bts/issue352

hg init foo
cd foo

A=`printf 'he\rllo'`

echo foo > "$A"
hg add
hg ci -A -m m
rm "$A"

echo foo > "hell
o"
hg add
hg ci -A -m m

echo foo > "$A"
hg debugwalk

exit 0