diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t --- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -315,8 +315,8 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 + preserving t for resolve of t starting 4 threads for background file closing (?) - preserving t for resolve of t t: versions differ -> m (premerge) picked tool ':merge' for t (binary False symlink False changedelete False) merging t