--- a/tests/test-topic.t	Thu Oct 08 20:43:15 2015 -0700
+++ b/tests/test-topic.t	Fri Oct 23 13:40:44 2015 +0100
@@ -287,8 +287,7 @@
   $ hg ci -m 'Narf is like `zort` or `poit`!'
   $ hg merge narf
   merging alpha
-  warning: conflicts during merge.
-  merging alpha incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging alpha! (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
   [1]