Mercurial > evolve

diff tests/test-evolve-progress.t @ 5565:fd2d61769bd0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: conditonalize a Windows only output in test-evolve-progress.t
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 17 Sep 2020 23:41:14 -0400
parents 4da1d21231ae
children d77d61c9e5e9 0d5c344c0ba4
line wrap: on
line diff
--- a/tests/test-evolve-progress.t	Wed Aug 26 09:07:52 2020 -0700
+++ b/tests/test-evolve-progress.t	Thu Sep 17 23:41:14 2020 -0400
@@ -123,6 +123,7 @@
    branchmerge: True, force: True, partial: False
    ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0
    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)