Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hg.py @ 7821:9fe7e6acf525

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents 7197812e8d44
children a218ba5f60df
line wrap: on
line diff
--- a/mercurial/hg.py	Wed Mar 04 17:02:16 2009 -0600
+++ b/mercurial/hg.py	Wed Mar 04 13:06:16 2009 -0600
@@ -274,7 +274,8 @@
     stats = _merge.update(repo, node, True, force, False)
     _showstats(repo, stats)
     if stats[3]:
-        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n"))
+        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
+                         "or 'hg up --clean' to abandon\n"))
     elif remind:
         repo.ui.status(_("(branch merge, don't forget to commit)\n"))
     return stats[3] > 0