# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1344513154 -3600
# Node ID d76328c84f3ed0dd1c91f8ba6f00c917c0e5d1a0
# Parent  9eb32646a6b8f1d90baa0b7b9112ccc90e37b6c1# Parent  5f7f30917a185716eb985890ed3ed996ddfb579b
Merge with stable

diff -r 9eb32646a6b8 -r d76328c84f3e tests/test-keyword.t
--- a/tests/test-keyword.t	Wed Jul 04 12:06:34 2012 +0100
+++ b/tests/test-keyword.t	Thu Aug 09 12:52:34 2012 +0100
@@ -998,7 +998,7 @@
 
   $ echo '$Id$' > m
   $ hg add m
-  $ hg commit -m 4kw 
+  $ hg commit -m 4kw
   $ echo foo >> m
   $ hg commit -m 5foo