Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
%% no changes%% no changes%% uncompressed contents in repothis is a test%% uncompress our working dir copythis is a test1 files updated, 0 files merged, 0 files removed, 0 files unresolved%% uncompress our new working dir copythis is a test