diff -r 2956948b81f3 -r 69cf255a55a1 mercurial/hg.py --- a/mercurial/hg.py Sat Nov 18 17:20:38 2006 -0200 +++ b/mercurial/hg.py Sun Nov 19 16:09:04 2006 +0100 @@ -243,7 +243,7 @@ " you can redo the full merge using:\n" " hg update -C %s\n" " hg merge %s\n") - % (pl[0].rev(), pl[1].rev())) + % (pl[0].rev(), pl[1].rev())) elif remind: repo.ui.status(_("(branch merge, don't forget to commit)\n")) return stats[3]