view tests/test-merge-force.out @ 8369:93a811ef3ac0

coal/paper: Wrap diff in <pre/>

In text-mode browsers the diff is otherwise rendered
as just one long line per file. Other styles do the same.

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