merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
#!/bin/sh
# test command parsing and dispatch
hg init a
cd a
echo a > a
hg ci -Ama -d '0 0'
echo "# missing arg"
hg cat
echo '% [defaults]'
hg cat a
cat > $HGRCPATH <<EOF
[defaults]
cat = -v
EOF
hg cat a
echo '% no repo'
cd ..
hg cat
exit 0