--- a/tests/test-merge7.t Tue Oct 06 22:57:21 2015 -0700
+++ b/tests/test-merge7.t Wed Oct 07 00:01:16 2015 -0700
@@ -86,7 +86,7 @@
ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
preserving test.txt for resolve of test.txt
test.txt: versions differ -> m
- picked tool 'internal:merge' for test.txt (binary False symlink False)
+ picked tool ':merge' for test.txt (binary False symlink False)
merging test.txt
my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
warning: conflicts during merge.