changeset 31772 | 3433bf56b768 |
parent 31516 | 2915cc1d3429 |
child 32584 | 746e12a767b3 |
child 33640 | 55681baf4cf9 |
--- 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