diff -r 2912881c2a98 -r f2daa6ab514a mercurial/hg.py
--- a/mercurial/hg.py	Thu Sep 16 16:00:29 2010 +0200
+++ b/mercurial/hg.py	Sun Sep 12 18:05:53 2010 -0500
@@ -403,7 +403,7 @@
     _showstats(repo, stats)
     if stats[3]:
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
-                         "or 'hg update -C' to abandon\n"))
+                         "or 'hg update -C .' to abandon\n"))
     elif remind:
         repo.ui.status(_("(branch merge, don't forget to commit)\n"))
     return stats[3] > 0