changeset 28318 | 564a354f7f35 |
parent 27596 | c881367688fe |
child 28627 | d7af9b4ae7dd |
--- a/tests/test-copy-move-merge.t Sun Feb 28 23:21:28 2016 -0500 +++ b/tests/test-copy-move-merge.t Mon Feb 29 01:01:20 2016 -0500 @@ -34,6 +34,7 @@ preserving a for resolve of b preserving a for resolve of c removing a + starting 4 threads for background file closing (?) b: remote moved from a -> m (premerge) picked tool ':merge' for b (binary False symlink False changedelete False) merging a and b to b