--- a/tests/test-copy-move-merge.t Tue Oct 06 22:57:21 2015 -0700
+++ b/tests/test-copy-move-merge.t Wed Oct 07 00:01:16 2015 -0700
@@ -35,12 +35,12 @@
preserving a for resolve of c
removing a
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@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
premerge successful
c: remote moved from a -> m
- picked tool 'internal:merge' for c (binary False symlink False)
+ picked tool ':merge' for c (binary False symlink False)
merging a and c to c
my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
premerge successful