--- a/mercurial/localrepo.py	Fri Mar 04 19:21:12 2011 -0600
+++ b/mercurial/localrepo.py	Sun Mar 06 15:21:50 2011 +0100
@@ -976,7 +976,7 @@
             for f in changes[0]:
                 if f in ms and ms[f] == 'u':
                     raise util.Abort(_("unresolved merge conflicts "
-                                                    "(see hg resolve)"))
+                                       "(see hg help resolve)"))
 
             cctx = context.workingctx(self, text, user, date, extra, changes)
             if editor: