diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t index 5e92ba77793c1b481999733d9865559c36172b5c_dGVzdHMvdGVzdC1zdWJyZXBvLnQ=..3433bf56b768e5a8358ed637b2a2fc2262adb0e2_dGVzdHMvdGVzdC1zdWJyZXBvLnQ= 100644 --- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -311,6 +311,7 @@ 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 (?) t: versions differ -> m (premerge) picked tool ':merge' for t (binary False symlink False changedelete False) merging t