tests/test-rename-merge1.t

--- a/tests/test-rename-merge1.t	Sat Nov 28 17:06:29 2015 +0800
+++ b/tests/test-rename-merge1.t	Wed Nov 25 14:25:26 2015 -0800
@@ -44,7 +44,7 @@
    b2: remote created -> g
   getting b2
    b: remote moved from a -> m (premerge)
-  picked tool ':merge' for b (binary False symlink False)
+  picked tool ':merge' for b (binary False symlink False changedelete False)
   merging a and b to b
   my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
    premerge successful