# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1187211399 18000
# Node ID 090ef15e1a038572e82ff08d0d357f6538fc5410
# Parent  6b4c332f241be80e5d2f21597e085bea7fcb0f20# Parent  0edea751bbb283aafe333c5adc595ad568a8daf1
Merge with stable

diff --git a/tests/test-grep b/tests/test-grep
--- a/tests/test-grep
+++ b/tests/test-grep
@@ -62,7 +62,7 @@ cd issue685
 echo octarine > color
 hg ci -Amcolor
 hg rename color colour
-Hg ci -Am rename
+hg ci -Am rename
 hg grep octarine
 # Used to crash here
 hg grep -r 1 octarine