resolve conflicts

akkartik

Dec 3, 2023, 7:43 PM

EC2J3KVDH5SQBQPLE76KYFLGPG3RRUQNHVF354TC2FKGVOCKBP3AC

Dependencies

• [2] OV6FE23R Merge text0
• [3] 4J3Y3DJW pijul bug: redo upstream change
• [4] R2ASHK5C fix a bad merge
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• resurrect zombie in edit.lua at line 265
  [4.5282]→[2.239:266](∅→∅),[4.5282]→[2.239:266](∅→∅)
  + elseif not readonly then
• resurrect zombie in edit.lua at line 320
  [4.7575]→[2.374:420](∅→∅),[4.7575]→[2.374:420](∅→∅)
  + elseif not readonly and chord == 'C-z' then
• resurrect zombie in edit.lua at line 333
  [4.8198]→[2.421:467](∅→∅),[4.8198]→[2.421:467](∅→∅)
  + elseif not readonly and chord == 'C-y' then
• resurrect zombie in edit.lua at line 354
  [4.9035]→[2.468:514](∅→∅),[4.9035]→[2.468:514](∅→∅)
  + elseif not readonly and chord == 'C-x' then
• resurrect zombie in edit.lua at line 360
  [4.9310]→[2.515:561](∅→∅),[4.9310]→[2.515:561](∅→∅)
  + elseif not readonly and chord == 'C-v' then