tests/test-keyword.t

--- a/tests/test-keyword.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-keyword.t	Mon May 26 11:44:58 2014 -0700
@@ -1049,11 +1049,11 @@
   [1]
   $ cat m
   $Id$
-  <<<<<<< local: 88a80c8d172e - test: "8bar"
+  <<<<<<< local: 88a80c8d172e - test: 8bar
   bar
   =======
   foo
-  >>>>>>> other: 85d2d2d732a5  - test: "simplemerge"
+  >>>>>>> other: 85d2d2d732a5  - test: simplemerge
 
 resolve to local