--- a/tests/test-merge7.t	Tue Apr 22 12:20:10 2014 -0700
+++ b/tests/test-merge7.t	Thu May 08 16:50:22 2014 -0700
@@ -98,11 +98,11 @@
 
   $ cat test.txt
   one
-  <<<<<<< local
+  <<<<<<< local: 50c3a7e29886  - test: "Merge 1"
   two-point-five
   =======
   two-point-one
-  >>>>>>> other
+  >>>>>>> other: 40d11a4173a8 - test: "two -> two-point-one"
   three
 
   $ hg debugindex test.txt