abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
adding aadding baNONEXISTENT: No such file or directoryaba: No such file or directoryNONEXISTENT: No such file or directorybaNONEXISTENT: No such file in rev 9e1684505872ab