diff -r d75c68b55af8 -r 0229ff95faec mercurial/localrepo.py
--- a/mercurial/localrepo.py	Fri Jun 30 22:04:02 2006 -0700
+++ b/mercurial/localrepo.py	Mon Jul 03 19:14:29 2006 +0200
@@ -1643,8 +1643,8 @@
         linear_path = (pa == p1 or pa == p2)
 
         if allow and linear_path:
-            raise util.Abort(_("there is nothing to merge, "
-                               "just use 'hg update'"))
+            raise util.Abort(_("there is nothing to merge, just use "
+                               "'hg update' or look at 'hg heads'"))
         if allow and not forcemerge:
             if modified or added or removed:
                 raise util.Abort(_("outstanding uncommitted changes"))