abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
%% no changes%% no changes%% uncompressed contents in repothis is a test%% uncompress our working dir copythis is a test%% uncompress our new working dir copythis is a test