Patchwork [7,of,8] test-subrepo: update output for Windows

login
register
mail settings
Submitter Matt Harbison
Date April 2, 2017, 11:12 p.m.
Message ID <eb4094d2421a9fc49c83.1491174773@Envy>
Download mbox | patch
Permalink /patch/19917/
State Accepted
Headers show

Comments

Matt Harbison - April 2, 2017, 11:12 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1491114249 14400
#      Sun Apr 02 02:24:09 2017 -0400
# Node ID eb4094d2421a9fc49c8342ff244840a6c085697b
# Parent  f2df1dcd45d44a7cb79663fdc22054797703385a
test-subrepo: update output for Windows

Patch

diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -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