view tests/test-merge-force.out @ 8063:ee8d9b93b316

convert/p4: win32 fixes

* cmd.exe does not know single quotes
* win32 does not like trailing whitespace very much. Trade test coverage for
  maintenance time and drop the trailing whitespaces tests.

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