Mercurial > hg-stable

diff tests/test-merge-default.t @ 15615:41885892796e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch: warn on branching
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Dec 2011 14:32:44 -0600
parents 4134686b83e1
children fc8c7a5ccc4a
line wrap: on
line diff
--- a/tests/test-merge-default.t	Mon Dec 05 17:09:11 2011 -0600
+++ b/tests/test-merge-default.t	Thu Dec 08 14:32:44 2011 -0600
@@ -84,6 +84,7 @@
   $ echo f >> a
   $ hg branch foobranch
   marked working directory as branch foobranch
+  (branches are permanent and global, did you want a bookmark?)
   $ hg commit -mf
 
 Should fail because merge with other branch: