Skip to content
Snippets Groups Projects
Commit 3433bf56b768 authored by Matt Harbison's avatar Matt Harbison
Browse files

test-subrepo: update output for Windows

parent 5e92ba77793c
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment