# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1251472708 -3600
# Node ID 473c764ba2b7bf43a0b7393750e9a173678d1994
# Parent  d0c35f5fa25faba7410d09a59165cbee1fb8386d# Parent  bf971e786e93960f19abccac99f34fe4705e2c79
Merge with stable

diff -r d0c35f5fa25f -r 473c764ba2b7 tests/test-keyword.out
--- a/tests/test-keyword.out	Wed Aug 05 16:56:49 2009 +0200
+++ b/tests/test-keyword.out	Fri Aug 28 16:18:28 2009 +0100
@@ -359,6 +359,7 @@
 # Parent  bb948857c743469b22bbf51f7ec8112279ca5d83
 xa
 
+diff -r bb948857c743 -r cfa68229c116 x/a
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/x/a	Thu Jan 01 00:00:03 1970 +0000
 @@ -0,0 +1,4 @@
@@ -371,6 +372,7 @@
 200 Script output follows
 
 
+diff -r ef63ca68695b -r bb948857c743 a
 --- a/a	Thu Jan 01 00:00:00 1970 +0000
 +++ b/a	Thu Jan 01 00:00:02 1970 +0000
 @@ -1,3 +1,4 @@