--- a/tests/test-convert-svn-sink.t	Fri Apr 18 18:56:26 2014 -0700
+++ b/tests/test-convert-svn-sink.t	Fri Apr 18 22:19:25 2014 -0700
@@ -352,6 +352,7 @@
   [1]
   $ hg --cwd b revert -r 2 b
   $ hg --cwd b resolve -m b
+  no unresolved files; you may continue your unfinished operation
   $ hg --cwd b ci -d '5 0' -m 'merge'
 
 Expect 4 changes