diff -r d14497cbd668 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue Apr 04 15:21:20 2006 +0200
+++ b/mercurial/localrepo.py	Tue Apr 04 18:08:06 2006 +0200
@@ -1734,9 +1734,21 @@ class localrepository(object):
                 (len(remove), _("removed")),
                 (len(failedmerge), _("unresolved")))
         note = ", ".join([_("%d files %s") % s for s in stat])
-        self.ui.note("%s\n" % note)
-        if moddirstate and branch_merge:
-            self.ui.note(_("(branch merge, don't forget to commit)\n"))
+        self.ui.status("%s\n" % note)
+        if moddirstate:
+            if branch_merge:
+                if failedmerge:
+                    self.ui.status(_("There are unresolved merges,"
+                                    " you can redo the full merge using:\n"
+                                    "  hg update -C %s\n"
+                                    "  hg merge %s\n"
+                                    % (self.changelog.rev(p1),
+                                        self.changelog.rev(p2))))
+                else:
+                    self.ui.status(_("(branch merge, don't forget to commit)\n"))
+            elif failedmerge:
+                self.ui.status(_("There are unresolved merges with"
+                                 " locally modified files.\n"))
 
         return err