author | mpm@selenic.com |
Sat, 30 Jul 2005 08:30:12 -0800 | |
changeset 788 | 64d2a558c943 |
parent 787 | f199e1887889 |
child 808 | 8f5637f0a0c0 |
mercurial/hg.py | file | annotate | diff | comparison | revisions |
--- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -1492,7 +1492,8 @@ class localrepository: 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