Mercurial > public > mercurial-scm > hg
diff mercurial/merge.py @ 11717:a286a4ecbfeb
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 31 Jul 2010 18:12:50 -0500 |
| parents | eb07fbc21e9c db426935fa94 |
| children | 05deba16c5d5 |
line wrap: on
line diff
--- a/mercurial/merge.py Sat Jul 31 11:41:58 2010 +0900 +++ b/mercurial/merge.py Sat Jul 31 18:12:50 2010 -0500 @@ -286,7 +286,7 @@ numupdates = len(action) for i, a in enumerate(action): f, m = a[:2] - u.progress('update', i + 1, item=f, total=numupdates, unit='files') + u.progress(_('updating'), i + 1, item=f, total=numupdates, unit='files') if f and f[0] == "/": continue if m == "r": # remove @@ -346,7 +346,7 @@ elif m == "e": # exec flags = a[2] util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) - u.progress('update', None, total=numupdates, unit='files') + u.progress(_('updating'), None, total=numupdates, unit='files') return updated, merged, removed, unresolved