changeset 28318 | 564a354f7f35 |
parent 27876 | 602add6ad9e5 |
child 30062 | 940c05b25b07 |
--- a/tests/test-rename-dir-merge.t Sun Feb 28 23:21:28 2016 -0500 +++ b/tests/test-rename-dir-merge.t Mon Feb 29 01:01:20 2016 -0500 @@ -85,6 +85,7 @@ resolving manifests branchmerge: True, force: False, partial: False ancestor: f9b20c0d4c51, local: 397f8b00a740+, remote: ce36d17b18fb + starting 4 threads for background file closing (?) b/c: local directory rename - get from a/c -> dg getting a/c to b/c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved