view tests/test-merge-force.out @ 7757:af6a63438a8a

identify: have consistent output for local repositories

Also, add some extensive testing for it (hardly any in the suite so far).

created new head
% local deleted a file, remote removed
abort: outstanding uncommitted changes
resolving manifests
removing a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% should show a as removed
R a
% manifest. should not have a:
b