tests/test-status-inprocess.py.out

pull: merge bookmark updates and imports

We do all the things in one go now, updating existing bookmark, adding new ones,
and overwriting the ones explicitly specified for --bookmark. This impacts the
tests by removing some duplicated or unnecessary output.

% creating repo
% add and commit
C test.py
% change
M test.py