view tests/test-586 @ 4819:9797124581c9

merge: fix adding untracked files on directory rename (issue612)

Fix from Brendan
Added test case

#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A