resolve conflicts

akkartik

Aug 7, 2024, 3:06 AM

MLNUVHHMB5KSHIUU5RZ3NJC6LSVQES5EB3WCVGUERGUB73AHMBOAC

Dependencies

• [2] AQZ7YIX5 resolve conflicts
• [3] QZUFJMD5 resolve conflicts
• [4] EF4DDGOA resolve conflicts
• [5] R2ASHK5C fix a bad merge
• [6] YXQOITYS Merge lines.love
• [7] KKQKPGCI resolve conflicts
• [8] UPQJIFDP hide file numbers in output editor
• [9] WKXJNESI resolve conflicts
• [10] GVJEOWYQ resolve conflicts
• [11] CRBLAWBO resolve conflicts
• [12] TYLURRX3 resolve conflicts
• [13] 7YGYHOEO Merge lines.love
• [14] RXMHAZ6V resolve conflicts
• [15] CQVWNL4M resolve conflicts
• [16] 7ZJJOIX6 pijul bug
• [17] OV6FE23R Merge text0
• [18] MBAJPTDJ resolve conflicts
• [19] QMRQL2FO resolve conflicts
• [20] O2E2MUT2 resolve conflicts
• [21] TFUNIT6M resolve conflicts
• [22] IS3FHU6Q resolve conflicts
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• resurrect zombie in edit.lua at line 110
  [5.58]→[5.740:802](∅→∅),[5.58]→[5.740:802](∅→∅)
  + function edit.draw(State, fg, hide_cursor, show_line_numbers)
• edit in edit.lua at line 470
  [5.12430]→[3.538:538](∅→∅),[5.58]→[5.15:58](∅→∅),[5.58]→[5.15:58](∅→∅)
  −

  − function edit.draw(State, fg, hide_cursor)
• resolve order conflict in edit.lua at line 470
  [5.12430]