--- a/tests/test-diff-change.t Thu Jan 20 13:43:43 2022 -0800
+++ b/tests/test-diff-change.t Thu Jan 20 14:13:12 2022 -0800
@@ -284,7 +284,7 @@
7
-<<<<<<< local: fd1f17c90d7c - test: new file
z
- -||||||| base
+ -||||||| base: ae119d680c82 - test: lots of text
-8
-=======
-y