# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1340368823 -3600
# Node ID 1e477be3b6c8e5a004fb06263efa991240d316c7
# Parent  df702ad9b3148ad2d370027035f632f07e9045e2# Parent  3007e5d9eb4e0e2aa2e25739175cfc81dfef17fc
Merge with stable

diff -r df702ad9b314 -r 1e477be3b6c8 tests/test-keyword.t
--- a/tests/test-keyword.t	Thu Jun 21 14:04:15 2012 +0100
+++ b/tests/test-keyword.t	Fri Jun 22 13:40:23 2012 +0100
@@ -505,7 +505,6 @@
   $ hg -q commit -d '1 14' -m 'prepare amend'
 
   $ hg --debug commit --amend -d '1 15' -m 'amend without changes' | grep keywords
-  invalidating branch cache (tip differs)
   overwriting a expanding keywords
   $ hg -q id
   a71343332ea9