Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Fri, 22 Jun 2012 13:40:23 +0100
changeset 1113 1e477be3b6c8
parent 1111 df702ad9b314 (current diff)
parent 1112 3007e5d9eb4e (diff)
child 1114 22b300b7a7c1
Merge with stable
--- 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