diff tests/test-grep.out @ 8916:3df8dbf706b0

merged with crew
author Martin Geisler <mg@lazybytes.net>
date Sun, 21 Jun 2009 19:06:57 +0200
parents 80cc4b1a62d0
children 717c35d55fb3
line wrap: on
line diff
--- a/tests/test-grep.out	Sat Jun 20 18:58:34 2009 +0200
+++ b/tests/test-grep.out	Sun Jun 21 19:06:57 2009 +0200
@@ -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