##// END OF EJS Templates
test-subrepo: update output for Windows
Matt Harbison -
r31772:3433bf56 default
parent child Browse files
Show More
@@ -311,6 +311,7 b' merge tests'
311 branchmerge: True, force: False, partial: False
311 branchmerge: True, force: False, partial: False
312 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
312 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
313 preserving t for resolve of t
313 preserving t for resolve of t
314 starting 4 threads for background file closing (?)
314 t: versions differ -> m (premerge)
315 t: versions differ -> m (premerge)
315 picked tool ':merge' for t (binary False symlink False changedelete False)
316 picked tool ':merge' for t (binary False symlink False changedelete False)
316 merging t
317 merging t
General Comments 0
You need to be logged in to leave comments. Login now