Mercurial > hg

diff tests/test-merge-commit.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 296d55def9c4
children eb586ed5d8ce
line wrap: on
line diff
--- a/tests/test-merge-commit.t	Sun Feb 28 23:21:28 2016 -0500
+++ b/tests/test-merge-commit.t	Mon Feb 29 01:01:20 2016 -0500
@@ -72,6 +72,7 @@
    branchmerge: True, force: False, partial: False
    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
    preserving bar for resolve of bar
+  starting 4 threads for background file closing (?)
    bar: versions differ -> m (premerge)
   picked tool ':merge' for bar (binary False symlink False changedelete False)
   merging bar
@@ -158,6 +159,7 @@
    branchmerge: True, force: False, partial: False
    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
    preserving bar for resolve of bar
+  starting 4 threads for background file closing (?)
    bar: versions differ -> m (premerge)
   picked tool ':merge' for bar (binary False symlink False changedelete False)
   merging bar