revert added and removed files to their normal state before reverting
add a test for revert
%% no merges expected%% merge of b expectedmerging for bmerging b%%Contents of b should be "this is file b1"This is file b1%% merge expected!merging for bmerging b%% merge of b expectedmerging for bmerging b