--- a/tests/test-subrepo.t	Tue Apr 22 12:20:10 2014 -0700
+++ b/tests/test-subrepo.t	Thu May 08 16:50:22 2014 -0700
@@ -298,11 +298,11 @@
 should conflict
 
   $ cat t/t
-  <<<<<<< local
+  <<<<<<< local: 20a0db6fbf6c - test: "10"
   conflict
   =======
   t3
-  >>>>>>> other
+  >>>>>>> other: 7af322bc1198  - test: "7"
 
 clone