--- a/tests/test-commit-amend.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-commit-amend.t	Sat Jul 26 03:32:49 2014 +0200
@@ -586,7 +586,7 @@
   merging cc incomplete! (edit conflicts, then use 'hg resolve --mark')
   [1]
   $ hg resolve -m cc
-  no more unresolved files
+  (no more unresolved files)
   $ hg ci -m 'merge bar'
   $ hg log --config diff.git=1 -pr .
   changeset:   23:93cd4445f720