abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
removing bthis update spans a branch affecting the following files: baborting update spanning branches!(use update -m to merge across branches or -C to lose changes)