Mercurial > public > mercurial-scm > hg
diff 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 |
line wrap: on
line diff
--- a/mercurial/hg.py Sat Nov 18 23:51:15 2006 -0200 +++ b/mercurial/hg.py Sat Nov 18 17:20:38 2006 -0200 @@ -242,8 +242,8 @@ repo.ui.status(_("There are unresolved merges," " you can redo the full merge using:\n" " hg update -C %s\n" - " hg merge %s\n" - % (pl[0].rev(), pl[1].rev()))) + " hg merge %s\n") + % (pl[0].rev(), pl[1].rev())) elif remind: repo.ui.status(_("(branch merge, don't forget to commit)\n")) return stats[3]