view tests/test-resolve.out @ 9317:8c1df18452aa

Backed out changeset 5724cd7b3688 (depends on other changes, no tests)

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