Mercurial > hg-stable

diff tests/test-copy-move-merge.t @ 28318:564a354f7f35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: flag Windows specific lines about background closing as optional
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 29 Feb 2016 01:01:20 -0500
parents c881367688fe
children d7af9b4ae7dd
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t	Sun Feb 28 23:21:28 2016 -0500
+++ b/tests/test-copy-move-merge.t	Mon Feb 29 01:01:20 2016 -0500
@@ -34,6 +34,7 @@
    preserving a for resolve of b
    preserving a for resolve of c
   removing a
+  starting 4 threads for background file closing (?)
    b: remote moved from a -> m (premerge)
   picked tool ':merge' for b (binary False symlink False changedelete False)
   merging a and b to b