# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1244536441 -7200
# Node ID 098d7464c8e43fe657f0c2e9a76c8a739b93709a
# Parent  cd5da00e93cdd51a4d372bd267e8ff7f50e6104f# Parent  4895a3df2098f324027ecf171f689cc9a9d758e9
Merge with stable

diff -r cd5da00e93cd -r 098d7464c8e4 tests/test-keyword
--- a/tests/test-keyword	Sun Jun 07 19:25:10 2009 +0200
+++ b/tests/test-keyword	Tue Jun 09 10:34:01 2009 +0200
@@ -117,7 +117,7 @@
 
 rm sym a b
 echo % update
-hg update
+hg update -C
 echo % cat
 cat a b