Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 21947:b081decd9062 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: add parenthesis around "no more unresolved files" message This message may be confused with an error message. Adding parenthesis around it will make it more recognisable as an informative message.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 26 Jul 2014 03:32:49 +0200
parents 0483ff40e326
children ad56fc55cbc3
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Jul 25 15:51:42 2014 -0500
+++ b/mercurial/commands.py	Sat Jul 26 03:32:49 2014 +0200
@@ -5062,7 +5062,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.status(_('no more unresolved files\n'))
+        ui.status(_('(no more unresolved files)\n'))
 
     return ret