merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
#!/bin/shhg initecho "Is there an error message when trying to diff non-existing files?"hg diff not foundecho "Is there an error message when trying to add non-existing files?"hg add not found