merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b