# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1562974698 14400
# Node ID 5c36a7e4912a3d43d298e72f17ba735243fb732c
# Parent  209f2b8a50dc8c57bf01b19d0e555a9bae7a7d9b
tests: properly position conditional output on Windows in test-subrepo.t

The test runner doesn't always guess the right location when optional output is
missing.  This goes with f6540aba8e3e.

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

diff -r 209f2b8a50dc -r 5c36a7e4912a tests/test-subrepo.t
--- a/tests/test-subrepo.t	Thu Jul 11 03:08:28 2019 +0530
+++ b/tests/test-subrepo.t	Fri Jul 12 19:38:18 2019 -0400
@@ -315,8 +315,8 @@
   resolving manifests
    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 (?)
-   preserving t for resolve of t
    t: versions differ -> m (premerge)
   picked tool ':merge' for t (binary False symlink False changedelete False)
   merging t