diff -r a51c522c0064 -r 7e503eff3c76 tests/test-conflict.t
--- a/tests/test-conflict.t	Tue Jan 18 15:04:55 2022 -0800
+++ b/tests/test-conflict.t	Tue Jan 18 13:23:49 2022 -0800
@@ -308,7 +308,7 @@
   2
   3
   <<<<<<<
-  ------- base
+  ------- working copy parent
   +++++++ working copy
    4
   +4.5
@@ -346,7 +346,7 @@
   3.5
   4.5
   5.5
-  ------- base
+  ------- working copy parent
   +++++++ destination
    3
   -4