Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 20095:1c46b18b0e1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Nov 2013 17:26:58 -0600
parents 79d3b6a45351 1dee888b22f7
children 85d9200ba9f0
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Nov 12 16:23:52 2013 +0900
+++ b/mercurial/commands.py	Fri Nov 22 17:26:58 2013 -0600
@@ -4513,7 +4513,7 @@
         rejected = [n for n in nodes
                     if newdata[cl.rev(n)] < targetphase]
         if rejected:
-            ui.warn(_('cannot move %i changesets to a more permissive '
+            ui.warn(_('cannot move %i changesets to a higher '
                       'phase, use --force\n') % len(rejected))
             ret = 1
         if changes: