Commit 6143f267 authored by Matt Harbison's avatar Matt Harbison
Browse files

tests: conditonalize a Windows only output in test-evolve-progress.t

branch : stable
parent d83b24d38853
Pipeline #10751 passed with stage
in 5 minutes and 8 seconds
......@@ -123,6 +123,7 @@ Test progress with --continue
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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment