resolve conflicts

akkartik

Dec 7, 2023, 9:22 AM

TUTDZZOOFN5SVJTCVVPHA5PDWEDA3MJLTZEFIDDYLWQPXAGSW2TQC

Dependencies

• [2] F2P336NO resolve conflicts
• [3] ZM6AON3A resolve conflicts
• [4] 36Z442IV back to commit 8123959e52f without code editing
• [5] CYGNFOA5 Merge text0
• [6] GQBMVYD4 Merge text.love
• [7] D2TYFYG2 Merge text.love
• [8] TVSDIF6D resolve conflicts
• [9] MX7YD2WC resolve conflicts
• [10] 5GHT3LUX copy correct warning message
• [11] VPRGENLA hide some details within the 'warning' state
• [12] QRUFNFPP Merge text0
• [13] ZC7UBMKI pijul bug
• [14] XSKVRP2S resolve conflicts
• [15] CLNTRHOK resolve conflicts
• [16] LXFHXL2N Merge text.love
• [17] G2SVT3RO Merge text0
• [18] AFDLKNAP resolve conflicts
• [19] JZTUZQ35 resolve conflicts
• [20] C3GUE45I Merge text.love
• [21] VUAAYL6X handlers for _all_ LÖVE events
• [22] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
• [23] ULKNZUZK resolve conflicts
• [24] JXI7KJSL Merge text0
• [*] OTIBCAUJ love2d scaffold
• [*] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing

Change contents

• edit in main.lua at line 225
  [4.1283]→[2.659:659](∅→∅),[4.67]→[3.12:12](∅→∅),[4.67]→[3.12:12](∅→∅)
  −

  −
• resolve order conflict in main.lua at line 225
  [4.1283]

  [4.223]
• edit in main.lua at line 264
  [4.247]→[2.665:665](∅→∅)
  −
• resurrect zombie in main.lua at line 264
  [4.1581]→[4.55:155](∅→∅),[4.1581]→[4.55:155](∅→∅)
  +

  + function warning_message()

  + assert(type(Current_app) == 'table')

  + return Current_app.message

  + end
• resolve order conflict in main.lua at line 264
  [4.247]

  [4.55]
• edit in Manual_tests.md at line 13
  [4.1386]→[2.954:1088](∅→∅)
  − - create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.