merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
*** failed to import extension badext: bit bucket overflowextension 'hgext.gpg' overrides commands: sigs sigcheck signhg help [COMMAND]show help for a command, extension, or list of commands