Mercurial > hg
diff tests/test-graft.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 | fa87536d3d70 |
children | 2803f94b7431 |
line wrap: on
line diff
--- a/tests/test-graft.t Mon Dec 07 20:57:50 2020 -0500 +++ b/tests/test-graft.t Mon Dec 07 20:32:05 2020 -0500 @@ -210,8 +210,8 @@ resolving manifests branchmerge: True, force: True, partial: False ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 + starting 4 threads for background file closing (?) preserving b for resolve of b - starting 4 threads for background file closing (?) b: local copied/moved from a -> m (premerge) picked tool ':merge' for b (binary False symlink False changedelete False) merging b and a to b