Mercurial > hg

diff tests/test-newbranch.out @ 10596:7648f32713f2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch: help misuse of hg branch to switch branches Maybe beginners tend to use 'hg branch EXISTING_BRANCH' instead of 'hg update EXISTING_BRANCH' as me. If so, let's help them to use 'update'. Also removed '(use --force to override)' because it can mislead them.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 12 Jan 2010 22:49:10 +0900
parents a5576908b589
children f0bfe42c7b1f
line wrap: on
line diff
--- a/tests/test-newbranch.out	Sat Mar 06 21:29:02 2010 -0800
+++ b/tests/test-newbranch.out	Tue Jan 12 22:49:10 2010 +0900
@@ -2,7 +2,7 @@
 foo
 marked working directory as branch bar
 % branch shadowing
-abort: a branch of the same name already exists (use --force to override)
+abort: a branch of the same name already exists (use 'hg update' to switch to it)
 marked working directory as branch default
 % there should be only one default branch head
 changeset:   3:bf1bc2f45e83