diff -r abb5ec3eb6ce -r ef1eb6df7071 tests/test-subrepo.t
--- a/tests/test-subrepo.t	Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-subrepo.t	Fri Oct 09 13:54:52 2015 -0700
@@ -302,8 +302,7 @@
   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')
+  warning: conflicts while merging t! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
     subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg