--- a/tests/test-backout.t	Tue Oct 06 22:57:21 2015 -0700
+++ b/tests/test-backout.t	Wed Oct 07 00:01:16 2015 -0700
@@ -620,7 +620,7 @@
   update: (current)
   phases: 3 draft
   $ hg resolve --all --debug
-  picked tool 'internal:merge' for foo (binary False symlink False)
+  picked tool ':merge' for foo (binary False symlink False)
   merging foo
   my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
    premerge successful