changeset 6004 | 5af5f0f9d724 |
parent 5857 | c704b03884ef |
child 6336 | 4b0c9c674707 |
--- a/tests/test-rename-merge1.out Sun Feb 03 19:29:05 2008 -0600 +++ b/tests/test-rename-merge1.out Sun Feb 03 19:29:05 2008 -0600 @@ -19,8 +19,10 @@ a: remote moved to b -> m b2: remote created -> g copying a to b +picked tool 'internal:merge' for a (binary False symlink False) merging a and b my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c + premerge successful removing a warning: detected divergent renames of a2 to: c2