--- a/tests/test-evolve-phase.t	Thu Jan 11 18:38:09 2018 +0530
+++ b/tests/test-evolve-phase.t	Thu Jan 11 18:36:05 2018 +0530
@@ -96,11 +96,11 @@
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,5 @@
-  +<<<<<<< local: 87495ea7c9ec - test: b
+  +<<<<<<< destination: 87495ea7c9ec - test: b
    b2
   +=======
   +c
-  +>>>>>>> graft: 13833940840c - test: c
+  +>>>>>>> evolving:    13833940840c - test: c
 
   $ hg glog
   @  3 - 87495ea7c9ec b (draft)