view tests/test-resolve.out @ 8817:6c9dce20ed70

Fixed patch.eol bug that truncated all patched lines to one character

Also updated the import-eol test to test with lines longer than one character,
and also empty lines.

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