[PATCH] merge: give hint as to how to discover uncommitted changes

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1243014954 18000
# Node ID fd254801d7b744abd35b99075f84ff8342138c92
# Parent  90f86a5330bbbcd075c792cd14fb6bb47b8ccd2c
merge: give hint as to how to discover uncommitted changes

Many users will try 'hg diff' here, and it will not show them missing files.

diff -r 90f86a5330bb -r fd254801d7b7 mercurial/merge.py
--- a/mercurial/merge.py	Mon May 18 17:36:24 2009 -0500
+++ b/mercurial/merge.py	Fri May 22 12:55:54 2009 -0500
@@ -455,7 +455,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, "
+                                   "see 'hg status'"))
         elif not overwrite:
             if pa == p1 or pa == p2: # linear
                 pass # all good