Mercurial > evolve
changeset 5565:fd2d61769bd0 stable
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 | d83b24d38853 |
| children | d1f6cf85bfec |
| files | tests/test-evolve-progress.t |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
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)