--- a/tests/test-keyword.t	Wed Oct 05 15:28:34 2016 +0200
+++ b/tests/test-keyword.t	Fri Oct 07 08:51:50 2016 -0700
@@ -1113,11 +1113,11 @@
   [1]
   $ cat m
   $Id$
-  <<<<<<< local: 88a80c8d172e - test: 8bar
+  <<<<<<< working copy: 88a80c8d172e - test: 8bar
   bar
   =======
   foo
-  >>>>>>> other: 85d2d2d732a5  - test: simplemerge
+  >>>>>>> merge rev:    85d2d2d732a5  - test: simplemerge
 
 resolve to local, m must contain hash of last change (local parent)