Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 15471:f520c9616db5
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 10 Nov 2011 11:00:27 -0600 |
parents | 9ab2b3b730ee e1005da0ae04 |
children | 95174c381525 |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Nov 10 10:59:03 2011 -0600 +++ b/mercurial/commands.py Thu Nov 10 11:00:27 2011 -0600 @@ -2561,7 +2561,7 @@ for pos, ctx in enumerate(repo.set("%ld", revs)): current = repo['.'] - ui.status('grafting revision %s\n' % ctx.rev()) + ui.status(_('grafting revision %s\n') % ctx.rev()) # we don't merge the first commit when continuing if not cont: