merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
Is there an error message when trying to diff non-existing files?
found: No such file or directory
not: No such file or directory
Is there an error message when trying to add non-existing files?
found: No such file or directory
not: No such file or directory