tests/test-resolve.out

clone: fall back to pull source repo cannot be locked, 937ee88da3ef was a noop

937ee88da3ef was a noop, it was missing the wait keyword

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