--- a/tests/test-rebase-conflicts.t Thu Jan 20 13:43:43 2022 -0800
+++ b/tests/test-rebase-conflicts.t Thu Jan 20 14:13:12 2022 -0800
@@ -374,7 +374,7 @@
a
+<<<<<<< dest: 328e4ab1f7cc ab - test: ab
b
- +||||||| base
+ +||||||| base: cb9a9f314b8b - test: a
+=======
+b
+c