resolve conflicts

akkartik

Jun 24, 2026, 10:55 PM

DXXK2MZSLLIBISOIJNSXMNES65IUDVDBCNQDYYOQMKLZ7R5UI3RQC

Dependencies

• [2] 6XLI6GUR resolve conflicts
• [3] F5BO2UEV support one more standard love handler
• [4] 57OGXVHZ Merge lines.love
• [5] XSLCFVFH .
• [6] VEGH5443 Merge upstream into main
• [7] DJQXH5EC Merge lines.love
• [8] AVTNUQYR basic test-enabled framework
• [9] AJB4LFRB try to maintain a reasonable line width
• [10] Z4KNS42N to open a file without a terminal, drag it on!
• [11] KKMFQDR4 editing source code from within the app
• [12] ZLEPKWDJ fork: capture frontend for a note-taking system
• [13] ELIVOJ4N bugfix: zoom in/out hotkeys
• [14] L7YY2MW3 resolve conflicts
• [*] OTIBCAUJ love2d scaffold

Change contents

• replacement in main.lua at line 168
  [4.7]→[4.550:579](∅→∅)
  − function App.focus(in_focus)
  [4.7]

  [2.274]
  + function App.directorydropped(dir)
• edit in main.lua at line 170
  [2.320]→[4.579:598](∅→∅),[4.579]→[4.579:598](∅→∅),[4.598]→[4.17:52](∅→∅),[4.52]→[4.634:640](∅→∅),[4.634]→[4.634:640](∅→∅)
  − if in_focus then

  − Last_focus_time = Current_time

  − end
• replacement in main.lua at line 171
  [4.671]→[4.671:717](∅→∅)
  − if run.focus then run.focus(in_focus) end
  [4.671]

  [4.717]
  + if run.dir_drop then run.dir_drop(dir) end
• replacement in main.lua at line 173
  [4.755]→[4.755:807](∅→∅)
  − if source.focus then source.focus(in_focus) end
  [4.755]

  [4.807]
  + if source.dir_drop then source.dir_drop(dir) end
• edit in main.lua at line 179
  [4.878]→[4.99:99](∅→∅),[4.7]→[3.0:35](∅→∅),[4.7]→[3.0:35](∅→∅)
  −

  − function App.directorydropped(dir)
• resurrect zombie in main.lua at line 179
  [3.35]→[3.35:112](∅→∅),[3.35]→[3.35:112](∅→∅)
  + if current_app_is_warning() then return end

  + if Current_app == 'run' then
• resolve order conflict in main.lua at line 179
  [4.878]
• edit in main.lua at line 179
  [0.163]

  [3.35]
  + function App.focus(in_focus)
• edit in main.lua at line 181
  [3.81]

  [3.81]
  + if in_focus then

  + Last_focus_time = Current_time

  + end
• replacement in main.lua at line 185
  [3.112]→[3.112:159](∅→∅),[3.112]→[3.112:159](∅→∅)
  − if run.dir_drop then run.dir_drop(dir) end
  [3.112]

  [3.159]
  + if run.focus then run.focus(in_focus) end
• replacement in main.lua at line 187
  [3.197]→[3.197:250](∅→∅),[3.197]→[3.197:250](∅→∅)
  − if source.dir_drop then source.dir_drop(dir) end
  [3.197]

  [3.250]
  + if source.focus then source.focus(in_focus) end