Mercurial > hg-stable

changeset 788:64d2a558c943

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add note about -C to update message
author mpm@selenic.com
date Sat, 30 Jul 2005 08:30:12 -0800
parents f199e1887889
children 8f5637f0a0c0
files mercurial/hg.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Thu Jul 28 07:46:08 2005 -0800
+++ b/mercurial/hg.py	Sat Jul 30 08:30:12 2005 -0800
@@ -1492,7 +1492,8 @@
                     if f in merge: cf = " (resolve)"
                     self.ui.status(" %s%s\n" % (f, cf))
                 self.ui.warn("aborting update spanning branches!\n")
-                self.ui.status("(use update -m to perform a branch merge)\n")
+                self.ui.status("(use update -m to merge across branches" +
+                               " or -C to lose changes)\n")
                 return 1
             # we have to remember what files we needed to get/change
             # because any file that's different from either one of its