view tests/test-resolve.out @ 7830:55bd03e2e13c

test-identify: require no-outer-repo

The test expects "There is no Mercurial repository here (.hg not found)"

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