Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 09 Aug 2012 12:52:34 +0100
changeset 1120 d76328c84f3e
parent 1118 9eb32646a6b8 (current diff)
parent 1119 5f7f30917a18 (diff)
child 1122 feb663195388
Merge with stable
--- 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