diff -r 7e622c9a9707 -r 2956948b81f3 mercurial/hg.py
--- 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]