Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 09 Jun 2009 10:34:01 +0200
changeset 572 098d7464c8e4
parent 569 cd5da00e93cd (current diff)
parent 571 4895a3df2098 (diff)
child 576 b21f76520d40
Merge with stable
--- 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