# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2019-07-12 23:38:18
# Node ID 8486675a08e1a06a61d25f1838865dada3c6d1e4
# Parent  8d03ee7317515229e720fe634ca7a7695b24d546

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 --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -315,8 +315,8 @@ merge tests
   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