merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
abort: repository a not found!
255
abort: error: Connection refused
255
abort: repository a not found!
255
abort: destination '../a' already exists
255
abort: repository a not found!
255
destination directory: q
abort: destination 'q' already exists