changeset 28318 | 564a354f7f35 |
parent 28121 | bd97ed121016 |
child 28634 | 3ceac01bc29f |
--- a/tests/test-graft.t Sun Feb 28 23:21:28 2016 -0500 +++ b/tests/test-graft.t Mon Feb 29 01:01:20 2016 -0500 @@ -167,6 +167,7 @@ branchmerge: True, force: True, partial: False ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 preserving b for resolve of b + starting 4 threads for background file closing (?) b: local copied/moved from a -> m (premerge) picked tool ':merge' for b (binary False symlink False changedelete False) merging b and a to b