Mercurial > hg
comparison mercurial/hg.py @ 3679:2956948b81f3
fix warnings generated by pygettext.py.
author | Marcos Chaves <marcos.nospam@gmail.com> |
---|---|
date | Sat, 18 Nov 2006 17:20:38 -0200 |
parents | 6ca49c5fe268 |
children | 69cf255a55a1 |
comparison
equal
deleted
inserted
replaced
3678:7e622c9a9707 | 3679:2956948b81f3 |
---|---|
240 if stats[3]: | 240 if stats[3]: |
241 pl = repo.parents() | 241 pl = repo.parents() |
242 repo.ui.status(_("There are unresolved merges," | 242 repo.ui.status(_("There are unresolved merges," |
243 " you can redo the full merge using:\n" | 243 " you can redo the full merge using:\n" |
244 " hg update -C %s\n" | 244 " hg update -C %s\n" |
245 " hg merge %s\n" | 245 " hg merge %s\n") |
246 % (pl[0].rev(), pl[1].rev()))) | 246 % (pl[0].rev(), pl[1].rev())) |
247 elif remind: | 247 elif remind: |
248 repo.ui.status(_("(branch merge, don't forget to commit)\n")) | 248 repo.ui.status(_("(branch merge, don't forget to commit)\n")) |
249 return stats[3] | 249 return stats[3] |
250 | 250 |
251 def revert(repo, node, choose, wlock): | 251 def revert(repo, node, choose, wlock): |