tests/test-merge7.t
changeset 28318 564a354f7f35
parent 27161 296d55def9c4
child 30062 940c05b25b07
--- a/tests/test-merge7.t	Sun Feb 28 23:21:28 2016 -0500
+++ b/tests/test-merge7.t	Mon Feb 29 01:01:20 2016 -0500
@@ -84,6 +84,7 @@
    branchmerge: True, force: False, partial: False
    ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
    preserving test.txt for resolve of test.txt
+  starting 4 threads for background file closing (?)
    test.txt: versions differ -> m (premerge)
   picked tool ':merge' for test.txt (binary False symlink False changedelete False)
   merging test.txt