Mercurial > evolve

diff tests/test-evolve-progress.t @ 5600:d77d61c9e5e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 15 Oct 2020 19:46:38 +0200
parents 4993cdeef79c fd2d61769bd0
children eb326644dc29
line wrap: on
line diff
--- a/tests/test-evolve-progress.t	Sun Oct 11 20:50:02 2020 +0800
+++ b/tests/test-evolve-progress.t	Thu Oct 15 19:46:38 2020 +0200
@@ -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)