tests/test-symlink-addremove.out

commit: tidy up mergestate slightly

% directory moved and symlinked
adding foo/a
% now addremove should remove old files
adding bar/a
adding foo
removing foo/a