diff tests/test-evolve-progress.t @ 6188:4c0d0be7cf95 mercurial-4.9

test-compat: merge mercurial-5.0 into mercurial-4.9
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 23:57:06 +0300
parents 785b5be835ee df8df57a3ce3
children 2cd36fe3f4e6
line wrap: on
line diff
--- a/tests/test-evolve-progress.t	Fri Nov 19 07:52:48 2021 +0300
+++ b/tests/test-evolve-progress.t	Tue Feb 22 23:57:06 2022 +0300
@@ -122,8 +122,8 @@
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0
+  starting 4 threads for background file closing (?)
    preserving a for resolve of a
-  starting 4 threads for background file closing (?)
    a: versions differ -> m (premerge)
   updating: a 1/1 files (100.00%)
   picked tool ':merge' for a (binary False symlink False changedelete False)