tests/test-grep.out

--- a/tests/test-grep.out	Sat Jun 20 17:09:49 2009 +0200
+++ b/tests/test-grep.out	Tue May 19 16:49:54 2009 +0900
@@ -38,6 +38,13 @@
 noeol:4:no infinite loo
 % issue 685
 adding color
+colour:1:octarine
 color:0:octarine
 colour:1:octarine
-colour:1:octarine
+% issue 337
+adding color
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+created new head
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+color:3:-:red
+color:1:+:red