diff -r b10a944c0486 -r a54a866349ed tests/test-merge-tools.t
--- a/tests/test-merge-tools.t	Tue Mar 15 13:40:45 2022 -0700
+++ b/tests/test-merge-tools.t	Tue Mar 15 13:31:39 2022 -0700
@@ -1225,12 +1225,8 @@
   merging f
   revision 0
   space
-  <<<<<<< working copy: ef83787e2614 - test: revision 1 (known-bad-output !)
   revision 1
   space
-  ======= (known-bad-output !)
-  revision 4 (known-bad-output !)
-  >>>>>>> merge rev:    81448d39c9a0 - test: revision 4 (known-bad-output !)
   revision 4
   <<<<<<< working copy: ef83787e2614 - test: revision 1
   revision 1