Mercurial > hg

diff mercurial/hg.py @ 9468:b2310903c462

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change.
author Stuart W Marks <smarks@smarks.org>
date Thu, 17 Sep 2009 22:39:38 -0700
parents dafadd7ff07e
children a3d73b3e1f8a
line wrap: on
line diff
--- a/mercurial/hg.py	Sat Sep 19 01:15:38 2009 +0200
+++ b/mercurial/hg.py	Thu Sep 17 22:39:38 2009 -0700
@@ -353,7 +353,7 @@
     _showstats(repo, stats)
     if stats[3]:
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
-                         "or 'hg up --clean' to abandon\n"))
+                         "or 'hg update -C' to abandon\n"))
     elif remind:
         repo.ui.status(_("(branch merge, don't forget to commit)\n"))
     return stats[3] > 0