resolve conflicts

akkartik

Aug 7, 2024, 3:03 AM

EF4DDGOAPLJL77RXKXWZT56F6BL74KG67M5NCXEUAP7Q3E3HGJHAC

Dependencies

• [2] O2E2MUT2 resolve conflicts
• [3] 7ZJJOIX6 pijul bug
• [4] OV6FE23R Merge text0
• [5] IS3FHU6Q resolve conflicts
• [6] R2ASHK5C fix a bad merge
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• resurrect zombie in edit.lua at line 105
  [4.58]→[4.15:58](∅→∅),[4.58]→[4.15:58](∅→∅)
  + function edit.draw(State, fg, hide_cursor)