# HG changeset patch
# User mpm@selenic.com
# Date 1122741012 28800
# Node ID 64d2a558c943c297bcf1abbb50ee8e36c6192b18
# Parent  f199e1887889f208806f70d348678c617839bbb2
add note about -C to update message



diff -r f199e1887889 -r 64d2a558c943 mercurial/hg.py
--- 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