merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
#!/bin/sh
#
# test for issue351
# Environement setup for MQ
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
#Repo init
hg init
hg qinit
echo b > b
hg ci -A -m foo
echo cc > b
hg qnew -f foo.diff
echo b > b
hg qrefresh
hg debugindex .hg/store/data/b.i