diff -r abb5ec3eb6ce -r ef1eb6df7071 tests/test-commit-amend.t
--- a/tests/test-commit-amend.t	Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-commit-amend.t	Fri Oct 09 13:54:52 2015 -0700
@@ -627,8 +627,7 @@
   $ hg add cc
   $ hg ci -m aa
   $ hg merge -q bar
-  warning: conflicts during merge.
-  merging cc incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging cc! (edit, then use 'hg resolve --mark')
   [1]
   $ hg resolve -m cc
   (no more unresolved files)