--- a/tests/test-rebase-conflicts.t	Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-rebase-conflicts.t	Fri Oct 09 13:54:52 2015 -0700
@@ -64,8 +64,7 @@
   rebasing 3:3163e20567cc "L1"
   rebasing 4:46f0b057b5c0 "L2"
   merging common
-  warning: conflicts during merge.
-  merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]