Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/localrepo.py @ 2038:5c4496ed152d
Tell the user the real "hg update -C" command, not just "-C" when aborting.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 02 Apr 2006 18:16:06 +0200 |
parents | d436b21b20dc |
children | a514c7509fa9 |
line wrap: on
line diff
--- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1662,7 +1662,7 @@ class localrepository(object): 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