# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2020-01-29 03:03:00
# Node ID 5de70f798ea76b5eddd12620817af77ab79e7784
# Parent  4a4c3b9fd91b2ac303d145678b361803f2a19c95

tests: stablize test-rename-merge1.t on Windows

This goes with d7622fdec3b5.

Differential Revision: https://phab.mercurial-scm.org/D8036

diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t
--- a/tests/test-rename-merge1.t
+++ b/tests/test-rename-merge1.t
@@ -213,6 +213,7 @@ modify x and rename y to z on the other 
    ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
    preserving x for resolve of x
    preserving z for resolve of z
+  starting 4 threads for background file closing (?)
    x: prompt changed/deleted -> m (premerge)
   picked tool ':prompt' for x (binary False symlink False changedelete True)
   file 'x' was deleted in other [merge rev] but was modified in local [working copy].