tests/test-double-merge.t
changeset 28318 564a354f7f35
parent 27161 296d55def9c4
child 42167 91a0bc50b288
--- a/tests/test-double-merge.t	Sun Feb 28 23:21:28 2016 -0500
+++ b/tests/test-double-merge.t	Mon Feb 29 01:01:20 2016 -0500
@@ -37,6 +37,7 @@
    ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
    preserving foo for resolve of bar
    preserving foo for resolve of foo
+  starting 4 threads for background file closing (?)
    bar: remote copied from foo -> m (premerge)
   picked tool ':merge' for bar (binary False symlink False changedelete False)
   merging foo and bar to bar