# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1326934865 -3600
# Node ID 93ced643068dbb56bc616df73985812c0fa8c08c
# Parent  40554705117dd5f6892b36dee2b2bfa17be99acc# Parent  91e083fab1a324c7f1813ccf3b7b4b7358aefe5c
Merge with default

diff -r 91e083fab1a3 -r 93ced643068d 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