--- a/mercurial/merge.py	Fri May 22 18:57:53 2009 +0200
+++ b/mercurial/merge.py	Fri May 22 11:42:21 2009 -0500
@@ -457,7 +457,8 @@
                     raise util.Abort(_("nothing to merge (use 'hg update'"
                                        " or check 'hg heads')"))
             if not force and (wc.files() or wc.deleted()):
-                raise util.Abort(_("outstanding uncommitted changes"))
+                raise util.Abort(_("outstanding uncommitted changes "
+                                   "(use 'hg status' to list changes)"))
         elif not overwrite:
             if pa == p1 or pa == p2: # linear
                 pass # all good