diff -r f9f82c444ff7 -r a5ff66e6d77a tests/test-subrepo.t
--- a/tests/test-subrepo.t	Sun Oct 11 20:04:40 2015 -0700
+++ b/tests/test-subrepo.t	Sun Oct 11 20:47:14 2015 -0700
@@ -300,6 +300,8 @@
   picked tool ':merge' for t (binary False symlink False)
   merging t
   my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
+  picked tool ':merge' for t (binary False symlink False)
+  my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
   warning: conflicts during merge.
   merging t incomplete! (edit conflicts, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved