--- a/mercurial/commands.py	Fri Apr 18 22:19:25 2014 -0700
+++ b/mercurial/commands.py	Fri May 09 14:46:50 2014 -0500
@@ -4981,8 +4981,7 @@
     # this with the list/show operation because we want list/show to remain
     # machine readable.
     if not list(ms.unresolved()) and not show:
-        ui.write(_('no unresolved files; '))
-        ui.write(_('you may continue your unfinished operation\n'))
+        ui.status(_('no more unresolved files\n'))
 
     return ret