--- a/tests/test-simplemerge.py	Fri Feb 18 12:55:39 2022 +0100
+++ b/tests/test-simplemerge.py	Fri Feb 18 14:27:43 2022 +0100
@@ -48,9 +48,6 @@
         )
 
 
-CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase
-
-
 def split_lines(t):
     return util.stringio(t).readlines()
 
@@ -179,7 +176,9 @@
 
         self.assertEqual(list(m3.merge_regions()), [(b'a', 0, 2)])
 
-        self.assertEqual(list(m3.merge_lines()), [b'aaa', b'bbb'])
+        self.assertEqual(
+            simplemerge.render_minimized(m3), ([b'aaa', b'bbb'], False)
+        )
 
     def test_no_conflicts(self):
         """No conflicts because only one side changed"""
@@ -204,7 +203,9 @@
             [b'aaa\n', b'bbb\n'],
         )
 
-        self.assertEqual(b''.join(m3.merge_lines()), b'aaa\nbbb\n222\n')
+        self.assertEqual(
+            b''.join(simplemerge.render_minimized(m3)[0]), b'aaa\nbbb\n222\n'
+        )
 
     def test_append_b(self):
         m3 = Merge3(
@@ -213,7 +214,9 @@
             [b'aaa\n', b'bbb\n', b'222\n'],
         )
 
-        self.assertEqual(b''.join(m3.merge_lines()), b'aaa\nbbb\n222\n')
+        self.assertEqual(
+            b''.join(simplemerge.render_minimized(m3)[0]), b'aaa\nbbb\n222\n'
+        )
 
     def test_append_agreement(self):
         m3 = Merge3(
@@ -222,7 +225,9 @@
             [b'aaa\n', b'bbb\n', b'222\n'],
         )
 
-        self.assertEqual(b''.join(m3.merge_lines()), b'aaa\nbbb\n222\n')
+        self.assertEqual(
+            b''.join(simplemerge.render_minimized(m3)[0]), b'aaa\nbbb\n222\n'
+        )
 
     def test_append_clash(self):
         m3 = Merge3(
@@ -231,7 +236,8 @@
             [b'aaa\n', b'bbb\n', b'333\n'],
         )
 
-        ml = m3.merge_lines(
+        ml, conflicts = simplemerge.render_minimized(
+            m3,
             name_a=b'a',
             name_b=b'b',
             start_marker=b'<<',
@@ -250,7 +256,8 @@
             [b'aaa\n', b'222\n', b'bbb\n'],
         )
 
-        ml = m3.merge_lines(
+        ml, conflicts = simplemerge.render_minimized(
+            m3,
             name_a=b'a',
             name_b=b'b',
             start_marker=b'<<',
@@ -285,12 +292,13 @@
             list(m3.merge_groups()),
             [
                 (b'unchanged', [b'aaa\n']),
-                (b'conflict', [], [b'111\n'], [b'222\n']),
+                (b'conflict', ([], [b'111\n'], [b'222\n'])),
                 (b'unchanged', [b'bbb\n']),
             ],
         )
 
-        ml = m3.merge_lines(
+        ml, conflicts = simplemerge.render_minimized(
+            m3,
             name_a=b'a',
             name_b=b'b',
             start_marker=b'<<',
@@ -338,7 +346,7 @@
     def test_merge_poem(self):
         """Test case from diff3 manual"""
         m3 = Merge3(TZU, LAO, TAO)
-        ml = list(m3.merge_lines(b'LAO', b'TAO'))
+        ml, conflicts = simplemerge.render_minimized(m3, b'LAO', b'TAO')
         self.log(b'merge result:')
         self.log(b''.join(ml))
         self.assertEqual(ml, MERGED_RESULT)
@@ -356,11 +364,11 @@
             other_text.splitlines(True),
             this_text.splitlines(True),
         )
-        m_lines = m3.merge_lines(b'OTHER', b'THIS')
+        m_lines, conflicts = simplemerge.render_minimized(m3, b'OTHER', b'THIS')
         self.assertEqual(
             b'<<<<<<< OTHER\r\nc\r\n=======\r\nb\r\n'
             b'>>>>>>> THIS\r\n'.splitlines(True),
-            list(m_lines),
+            m_lines,
         )
 
     def test_mac_text(self):
@@ -372,11 +380,11 @@
             other_text.splitlines(True),
             this_text.splitlines(True),
         )
-        m_lines = m3.merge_lines(b'OTHER', b'THIS')
+        m_lines, conflicts = simplemerge.render_minimized(m3, b'OTHER', b'THIS')
         self.assertEqual(
             b'<<<<<<< OTHER\rc\r=======\rb\r'
             b'>>>>>>> THIS\r'.splitlines(True),
-            list(m_lines),
+            m_lines,
         )