Mercurial > public > mercurial-scm > hg

diff tests/test-subrepo.t @ 31772:3433bf56b768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-subrepo: update output for Windows
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 02 Apr 2017 02:24:09 -0400
parents 2915cc1d3429
children 746e12a767b3 55681baf4cf9
line wrap: on
line diff
--- a/tests/test-subrepo.t	Sun Apr 02 01:51:07 2017 -0400
+++ b/tests/test-subrepo.t	Sun Apr 02 02:24:09 2017 -0400
@@ -311,6 +311,7 @@
    branchmerge: True, force: False, partial: False
    ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
    preserving t for resolve of t
+  starting 4 threads for background file closing (?)
    t: versions differ -> m (premerge)
   picked tool ':merge' for t (binary False symlink False changedelete False)
   merging t