changeset 28318 | 564a354f7f35 |
parent 28065 | 6b1fc09c699a |
child 29350 | 35861cc1076e |
--- a/tests/test-up-local-change.t Sun Feb 28 23:21:28 2016 -0500 +++ b/tests/test-up-local-change.t Mon Feb 29 01:01:20 2016 -0500 @@ -73,6 +73,7 @@ preserving a for resolve of a b: other deleted -> r removing b + starting 4 threads for background file closing (?) a: versions differ -> m (premerge) picked tool 'true' for a (binary False symlink False changedelete False) merging a