--- a/tests/test-keyword.t	Tue Apr 22 12:20:10 2014 -0700
+++ b/tests/test-keyword.t	Thu May 08 16:50:22 2014 -0700
@@ -1049,11 +1049,11 @@
   [1]
   $ cat m
   $Id$
-  <<<<<<< local
+  <<<<<<< local: 88a80c8d172e - test: "8bar"
   bar
   =======
   foo
-  >>>>>>> other
+  >>>>>>> other: 85d2d2d732a5  - test: "simplemerge"
 
 resolve to local