merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
#!/bin/shhg initecho a > ahg ci -d '0 0' -Amahg an aecho "[ui]" >> $HGRCPATHecho "strict=True" >> $HGRCPATHhg an ahg annotate aecho % should succeed - up is an alias, not an abbreviationhg up