diff -r 8e805cf27caa -r 940c05b25b07 tests/test-merge7.t
--- a/tests/test-merge7.t	Wed Oct 05 15:28:34 2016 +0200
+++ b/tests/test-merge7.t	Fri Oct 07 08:51:50 2016 -0700
@@ -99,11 +99,11 @@
 
   $ cat test.txt
   one
-  <<<<<<< local: 50c3a7e29886  - test: Merge 1
+  <<<<<<< working copy: 50c3a7e29886  - test: Merge 1
   two-point-five
   =======
   two-point-one
-  >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one
+  >>>>>>> merge rev:    40d11a4173a8 - test: two -> two-point-one
   three
 
   $ hg debugindex test.txt