diff tests/test-copy-move-merge.t @ 46072:69429972ff1f

tests: correct the output order about starting a background thread for Windows I didn't track down where this change occurred. I assume it's related to some buffering changes, and/or an explicit flush somewhere. Differential Revision: https://phab.mercurial-scm.org/D9539
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 07 Dec 2020 20:32:05 -0500
parents f90a5c211251
children 38941a28406a
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t	Mon Dec 07 20:57:50 2020 -0500
+++ b/tests/test-copy-move-merge.t	Mon Dec 07 20:32:05 2020 -0500
@@ -100,10 +100,10 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
+  starting 4 threads for background file closing (?)
    preserving a for resolve of b
    preserving a for resolve of c
   removing a
-  starting 4 threads for background file closing (?)
    b: remote moved from a -> m (premerge)
   picked tool ':merge' for b (binary False symlink False changedelete False)
   merging a and b to b