resolve conflicts

akkartik

Nov 9, 2024, 4:54 PM

JXFXMMVEKTIT66PXKWSA2MRTGFZNSVV45EUELJI5GSRT3JYXDEBAC

Dependencies

• [2] Q4CJ4WWU switch to a single global output editor
• [3] 2KACFSV7 bugfix: print(nil)
• [4] I52S4E5F running `print` now appends to output editor

Change contents

• edit in 0050-print_to_output at line 2
  [4.1497]→[2.1042:1083](∅→∅),[4.1497]→[2.1042:1083](∅→∅)
  − table.insert(Output_editor_state.lines,
• resurrect zombie in 0050-print_to_output at line 2
  [4.1443]→[3.572:653](∅→∅),[4.1443]→[3.572:653](∅→∅)
  + local args = pack(...)

  + local line = table.concat(map_nil(args, tostring), ' ')
• edit in 0050-print_to_output at line 4
  [3.653]

  [4.1551]
  + table.insert(Output_editor_state.lines,