view tests/test-resolve.out @ 11227:054549ccb680 stable

status: avoid performance regression when no .hgsub is present

(introduced by 24ce8f0c0a39)

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