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