# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1323385800 -3600
# Node ID 1321f8629e893f3c59b747cd4be0248009153d85
# Parent  0350b6b64affde90ae90f2d3128ef3afbc5f2d80# Parent  53da6702a77f2e7125d4f667b8c1373078d20718
Merge with stable

diff -r 0350b6b64aff -r 1321f8629e89 tests/test-keyword.t
--- a/tests/test-keyword.t	Thu Nov 24 06:43:43 2011 +0000
+++ b/tests/test-keyword.t	Fri Dec 09 00:10:00 2011 +0100
@@ -1005,6 +1005,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch foo
   marked working directory as branch foo
+  (branches are permanent and global, did you want a bookmark?)
   $ mv a a.bak
   $ echo foobranch > a
   $ cat a.bak >> a