Mercurial > hg

diff mercurial/hg.py @ 12314:f2daa6ab514a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge.
author Brodie Rao <brodie@bitheap.org>
date Sun, 12 Sep 2010 18:05:53 -0500
parents e392d00ab5b0
children 40852b4b910c
line wrap: on
line diff
--- a/mercurial/hg.py	Thu Sep 16 16:00:29 2010 +0200
+++ b/mercurial/hg.py	Sun Sep 12 18:05:53 2010 -0500
@@ -403,7 +403,7 @@
     _showstats(repo, stats)
     if stats[3]:
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
-                         "or 'hg update -C' 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