Mercurial > hg > gitweb

changeset 808:8f5637f0a0c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Sat, 30 Jul 2005 08:35:29 -0800
parents 64d2a558c943 (diff) 5e779f96edb0 (current diff)
children 0902ffece4b4
files .hgignore MANIFEST.in hgeditor hgmerge mercurial/commands.py mercurial/hg.py mercurial/transaction.py mercurial/util.py templates/changelogentry-rss.tmpl templates/filelogentry-rss.tmpl tests/README tests/fish-merge tests/run-tests tests/test-backwards-remove tests/test-backwards-remove.out tests/test-bad-pull tests/test-bad-pull.out tests/test-basic tests/test-basic.out tests/test-bdiff tests/test-clone tests/test-clone-failure tests/test-clone-failure.out tests/test-clone.out tests/test-conflict tests/test-conflict.out tests/test-copy tests/test-copy.out tests/test-diffdir tests/test-diffdir.out tests/test-empty-dir tests/test-empty-dir.out tests/test-flags tests/test-flags.out tests/test-help tests/test-help.out tests/test-hook tests/test-hook.out tests/test-hup tests/test-hup.out tests/test-merge-revert tests/test-merge-revert.out tests/test-merge-revert2 tests/test-merge-revert2.out tests/test-merge1 tests/test-merge1.out tests/test-merge2 tests/test-merge2.out tests/test-merge3 tests/test-merge3.out tests/test-merge4 tests/test-merge4.out tests/test-merge5 tests/test-merge5.out tests/test-merge6 tests/test-merge6.out tests/test-pull tests/test-pull.out tests/test-rawcommit1 tests/test-rawcommit1.out tests/test-simple-update tests/test-simple-update.out tests/test-tag tests/test-tag.out tests/test-tags tests/test-tags.out tests/test-undo tests/test-undo.out tests/test-unrelated-pull tests/test-unrelated-pull.out tests/test-up-local-change tests/test-up-local-change.out
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Fri Jul 29 22:31:45 2005 +0100
+++ b/mercurial/hg.py	Sat Jul 30 08:35:29 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