Merge with default stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 19 Jan 2012 02:01:05 +0100
branchstable
changeset 1043 93ced643068d
parent 1041 40554705117d (diff)
parent 1042 91e083fab1a3 (current diff)
child 1044 23c6e5d22e79
Merge with default
tests/test-keyword.t
--- a/tests/test-keyword.t	Sun Jan 15 13:37:33 2012 +0100
+++ b/tests/test-keyword.t	Thu Jan 19 02:01:05 2012 +0100
@@ -556,6 +556,7 @@
 Commit and show expansion in original and copy
 
   $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
+  invalidating branch cache (tip differs)
   c
    c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
   overwriting c expanding keywords