##// END OF EJS Templates
tests: properly position conditional output on Windows in test-subrepo.t...
Matt Harbison -
r42811:5c36a7e4 default
parent child Browse files
Show More
@@ -315,8 +315,8 b' merge tests'
315 resolving manifests
315 resolving manifests
316 branchmerge: True, force: False, partial: False
316 branchmerge: True, force: False, partial: False
317 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
317 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
318 preserving t for resolve of t
318 starting 4 threads for background file closing (?)
319 starting 4 threads for background file closing (?)
319 preserving t for resolve of t
320 t: versions differ -> m (premerge)
320 t: versions differ -> m (premerge)
321 picked tool ':merge' for t (binary False symlink False changedelete False)
321 picked tool ':merge' for t (binary False symlink False changedelete False)
322 merging t
322 merging t
General Comments 0
You need to be logged in to leave comments. Login now