Mercurial > hg
changeset 31772:3433bf56b768
test-subrepo: update output for Windows
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 02 Apr 2017 02:24:09 -0400 |
| parents | 5e92ba77793c |
| children | 5646d7bcd823 |
| files | tests/test-subrepo.t |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-subrepo.t Sun Apr 02 01:51:07 2017 -0400 +++ b/tests/test-subrepo.t Sun Apr 02 02:24:09 2017 -0400 @@ -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