view tests/test-resolve.out @ 7948:de377b1a9a84

move encoding bits from util to encoding

In addition to cleaning up util, this gets rid of some circular dependencies.

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