--- a/tests/test-merge-revert2.t	Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-merge-revert2.t	Fri Oct 09 13:54:52 2015 -0700
@@ -44,8 +44,7 @@
 
   $ hg update
   merging file1
-  warning: conflicts during merge.
-  merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging file1! (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
   [1]