resolve conflicts

akkartik

Oct 30, 2024, 1:37 AM

6URUI2FW5SKAJFD7XFHVUCC6LF46PVLWOSQ3YTQBZZWVNNGRWZIQC

Dependencies

• [2] 5QQKIYB7 resolve conflicts
• [3] O7YTBRQY bugfix: restart search on backspace
• [4] 2TCIWW6Z stop caching starty
• [5] 4NFSODHH Merge text0
• [6] ZS5IYZH5 stop caching screen_bottom1
• [7] GSZOSB6Y bugfix: keep wrapping lines within window boundaries
• [8] CUFW4EJL reorganize app.lua and its comments
• [9] NSM73TX3 crap, fix some final changes in the source editor
• [10] MPLM5UH7 resolve conflicts
• [*] 3QNOKBFM beginnings of a test harness

Change contents

• edit in app.lua at line 260
  [4.199]→[4.199:255](∅→∅),[4.255]→[2.423:423](∅→∅)
  − --? test_down_arrow_scrolls_down_by_one_screen_line()

  −
• resurrect zombie in app.lua at line 260
  [4.8755]→[3.2972:2992](∅→∅),[4.8755]→[3.2972:2992](∅→∅)
  + --? test_search()
• resolve order conflict in app.lua at line 260
  [4.199]

  [3.2972]