Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 09 Dec 2011 00:10:00 +0100
changeset 1036 1321f8629e89
parent 1034 0350b6b64aff (current diff)
parent 1035 53da6702a77f (diff)
child 1040 15aa105f81e2
Merge with stable
--- 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