tests/test-revert-unknown.out

merge: simplify flag merging code slightly

%% Should show unknown
? unknown
removing b
%% Should show unknown and b removed
R b
? unknown
%% Should show a and unknown
a
unknown