--- a/tests/test-merge-commit.t Mon Dec 07 20:57:50 2020 -0500
+++ b/tests/test-merge-commit.t Mon Dec 07 20:32:05 2020 -0500
@@ -70,8 +70,8 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
+ starting 4 threads for background file closing (?)
preserving bar for resolve of bar
- starting 4 threads for background file closing (?)
bar: versions differ -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False)
merging bar
@@ -157,8 +157,8 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
+ starting 4 threads for background file closing (?)
preserving bar for resolve of bar
- starting 4 threads for background file closing (?)
bar: versions differ -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False)
merging bar