merge: fix adding untracked files on directory rename (issue612)
Fix from Brendan
Added test case
adding he
llo
abort: '\n' and '\r' disallowed in filenames
adding he
llo
abort: '\n' and '\r' disallowed in filenames
adding hell
o
abort: '\n' and '\r' disallowed in filenames
adding hell
o
abort: '\n' and '\r' disallowed in filenames
f he
llo he
llo
f hell
o hell
o