Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 2038 5c4496ed152d
parent 2029 d436b21b20dc
child 2042 a514c7509fa9 
--- a/mercurial/localrepo.py	Sun Apr 02 08:19:41 2006 +0200
+++ b/mercurial/localrepo.py	Sun Apr 02 18:16:06 2006 +0200
@@ -1662,7 +1662,7 @@
                     self.ui.status(" %s%s\n" % (f, cf))
                 self.ui.warn(_("aborting update spanning branches!\n"))
                 self.ui.status(_("(use 'hg merge' to merge across branches"
-                                 " or '-C' to lose changes)\n"))
+                                 " or 'hg update -C' to lose changes)\n"))
                 return 1
             branch_merge = True
mercurial