--- a/tests/test-update-branches.t Thu Jan 20 13:43:43 2022 -0800
+++ b/tests/test-update-branches.t Thu Jan 20 14:13:12 2022 -0800
@@ -295,7 +295,7 @@
<<<<<<< working copy: 6efa171f091b - test: 3
three
dirty
- ||||||| base
+ ||||||| base: 6efa171f091b - test: 3
three
=======
four