Mercurial > hg
changeset 42605:5c36a7e4912a
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
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Fri, 12 Jul 2019 19:38:18 -0400 |
| parents | 209f2b8a50dc |
| children | 97b03f0e7c7b |
| files | tests/test-subrepo.t |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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