Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 8545:3682a19bb637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Steve Borho <steve@borho.org>
date Fri, 22 May 2009 11:42:21 -0500
parents 3f4f14eab085
children f8be48c6b08c
line wrap: on
line diff
--- 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