tests/test-rebase-collapse.t
changeset 48584 74973a6d4e67
parent 47070 d90f6237b3aa
child 48588 402a6b6173e9
--- a/tests/test-rebase-collapse.t	Thu Jan 20 13:43:43 2022 -0800
+++ b/tests/test-rebase-collapse.t	Thu Jan 20 14:13:12 2022 -0800
@@ -719,7 +719,7 @@
   $ cat A
   <<<<<<< dest:   82b8abf9c185 D - test: D
   D
-  ||||||| base
+  ||||||| base:   4a2df7238c3b A - test: A
   A
   =======
   B
@@ -747,7 +747,7 @@
   $ cat A
   <<<<<<< dest:   82b8abf9c185 D - test: D
   BC
-  ||||||| base
+  ||||||| base:   f899f3910ce7 B - test: B
   B
   =======
   C