merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
#!/bin/sh# a test for issue586hg init acd aecho a > ahg ci -Amahg init ../bcd ../becho b > bhg ci -Ambhg pull -f ../ahg mergehg rm -f ahg ci -Amchg st -A