tests/test-resolve.out

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.

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% resolve -l, should be empty