# HG changeset patch # User Matt Harbison # Date 1600400474 14400 # Node ID fd2d61769bd0e106dc41035e9bb5e1891e2a395f # Parent d83b24d38853816c8a1e92ac554d5a6f06de7f56 tests: conditonalize a Windows only output in test-evolve-progress.t diff -r d83b24d38853 -r fd2d61769bd0 tests/test-evolve-progress.t --- 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)