view tests/test-resolve.out @ 10081:a5f3f9b1c42a

test-rollback: Ignore hook exit code

Failing hooks returned 255 on Solaris

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 update -C' to abandon
% resolve -l, should be empty