merge: copy fixes and tests Fix up "already seen" logic Fix merge action in remote copy case Add status message Add lots of merge+copy/move test cases

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