diff -r f9f82c444ff7 -r a5ff66e6d77a tests/test-merge7.t
--- a/tests/test-merge7.t	Sun Oct 11 20:04:40 2015 -0700
+++ b/tests/test-merge7.t	Sun Oct 11 20:47:14 2015 -0700
@@ -89,6 +89,8 @@
   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
+  picked tool ':merge' for test.txt (binary False symlink False)
+  my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
   warning: conflicts during merge.
   merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved