resolve conflicts

akkartik

Nov 13, 2023, 3:51 AM

L7YY2MW3TGNIQ6X4YYTVW7N7Y7F5W3EVKJEHAFMLDLROWWBQXFFAC

Dependencies

• [2] 7OVYFH6I Merge lines.love
• [3] 7SICLTED check for 'error' mode in a few more places
• [4] WQOSZSUE warn on unused commandline args
• [5] KKMFQDR4 editing source code from within the app
• [6] KMSL74GA support selections in the source editor
• [7] Z4KNS42N to open a file without a terminal, drag it on!
• [8] TSK2OXU2 .
• [9] AVTNUQYR basic test-enabled framework
• [10] 57OGXVHZ Merge lines.love
• [11] DRZIG4NU Merge lines.love
• [12] YT5P6TO6 bugfix: save previous file when dropping a new one on
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 69
  [4.186724]

  [2.16]
  + elseif Current_app == 'error' then
• edit in main.lua at line 90
  [4.186724]→[3.0:37](∅→∅),[4.186724]→[3.0:37](∅→∅)
  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 90
  [4.437]

  [4.186725]
• edit in main.lua at line 155
  [4.807]

  [4.807]
  + elseif Current_app == 'error' then
• edit in main.lua at line 161
  [4.188255]→[3.190:227](∅→∅),[4.188255]→[3.190:227](∅→∅)
  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 161
  [4.878]

  [4.1353]