diff tests/test-log.t @ 15623:fc8c7a5ccc4a

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 08 Dec 2011 16:01:44 -0600
parents 2371f4aea665 41885892796e
children 988409e44a76
line wrap: on
line diff
--- a/tests/test-log.t	Thu Dec 08 16:39:00 2011 +0100
+++ b/tests/test-log.t	Thu Dec 08 16:01:44 2011 -0600
@@ -629,6 +629,7 @@
   adding a
   $ hg branch test
   marked working directory as branch test
+  (branches are permanent and global, did you want a bookmark?)
   $ echo b > b
   $ hg ci -A -m "commit on test"
   adding b