changeset 26517 | d8463a743d7d |
parent 25125 | bd625cd4e5e7 |
child 26618 | 8e6d5b7317e6 |
--- a/tests/test-rename-merge1.t Tue Oct 06 22:57:21 2015 -0700 +++ b/tests/test-rename-merge1.t Wed Oct 07 00:01:16 2015 -0700 @@ -41,7 +41,7 @@ b2: remote created -> g getting b2 b: remote moved from a -> m - picked tool 'internal:merge' for b (binary False symlink False) + picked tool ':merge' for b (binary False symlink False) merging a and b to b my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c premerge successful