resolve conflicts

akkartik

Nov 12, 2025, 7:18 PM

XVXLKRLJD4XKM7ZHPMCXIOS4YISAVTNYIC3RQCEAU5YWQUMG6TBQC

Dependencies

• [2] 4267SAXB bugfix: bring back an accidentally deleted line
• [3] EC2J3KVD resolve conflicts
• [4] PZYSWJZC resolve conflicts
• [5] X5XUIB72 resolve conflicts
• [6] 67PWAM7G resolve conflicts
• [7] KKQKPGCI resolve conflicts
• [8] FM5LDKGT Merge text.love
• [9] FHZ5AG3M resolve conflicts
• [10] YXQOITYS Merge lines.love
• [11] 7YGYHOEO Merge lines.love
• [12] CQVWNL4M resolve conflicts
• [13] WKXJNESI resolve conflicts
• [14] X43ZIKR3 Merge text.love
• [15] QMRQL2FO resolve conflicts
• [16] PT7ICD7Z resolve conflicts
• [17] TYLURRX3 resolve conflicts
• [18] S7CSVBHZ resolve conflicts
• [19] FBBHEUQN resolve conflicts
• [20] CRBLAWBO resolve conflicts
• [21] 2JLMNZZI Merge text.love
• [22] OV6FE23R Merge text0
• [23] 2EELKVO2 resolve conflicts
• [24] G2LAMLBU resolve conflicts
• [25] KFEUQWHX resolve conflicts
• [26] RXMHAZ6V resolve conflicts
• [27] 36Z442IV back to commit 8123959e52f without code editing
• [28] TFUNIT6M resolve conflicts
• [29] GVJEOWYQ resolve conflicts
• [30] R2ASHK5C fix a bad merge
• [31] KWW63AXQ Merge text0
• [32] 4J3Y3DJW pijul bug: redo upstream change
• [33] QZUFJMD5 resolve conflicts
• [34] QW7YRY25 Merge text0
• [35] MBAJPTDJ resolve conflicts
• [*] OTIBCAUJ love2d scaffold
• [*] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in main.lua at line 131
  [7.220]→[7.220:277](∅→∅),[7.220]→[7.220:277](∅→∅)
  − local os = love.system.getOS()

  − if os == 'Linux' then
• resurrect zombie in main.lua at line 132
  [6.66]→[7.277:513](∅→∅),[7.277]→[7.277:513](∅→∅),[7.277]→[7.277:513](∅→∅)
  + -- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.

  + App.screen.move(settings.x, settings.y-37, settings.displayindex)

  + else

  + App.screen.move(settings.x, settings.y, settings.displayindex)

  + end
• resurrect zombie in main.lua at line 143
  [2.40]→[7.513:518](∅→∅),[7.695]→[7.513:518](∅→∅),[7.513]→[7.513:518](∅→∅),[7.513]→[7.513:518](∅→∅)
  + end

  +
• edit in edit.lua at line 267
  [5.509]

  [7.325]
  + local dm = App.default_modifier
• replacement in edit.lua at line 320
  [7.7575]→[7.374:420](∅→∅),[7.7575]→[7.1166:1197](∅→∅)
  − elseif not readonly and chord == 'C-z' then

  − elseif chord == dm('z') then
  [7.7575]

  [7.7711]
  + elseif not readonly and chord == dm('z') then
• replacement in edit.lua at line 331
  [7.8198]→[7.421:467](∅→∅),[7.8198]→[7.1198:1229](∅→∅)
  − elseif not readonly and chord == 'C-y' then

  − elseif chord == dm('y') then
  [7.8198]

  [7.8334]
  + elseif not readonly and chord == dm('y') then
• edit in edit.lua at line 351
  [7.9035]→[7.468:514](∅→∅),[7.514]→[4.19:19](∅→∅),[7.9035]→[7.1294:1325](∅→∅)
  − elseif not readonly and chord == 'C-x' then

  −

  − elseif chord == dm('x') then
• resurrect zombie in edit.lua at line 351
  [4.19]→[7.365:427](∅→∅),[7.1325]→[7.365:427](∅→∅),[7.9064]→[7.365:427](∅→∅),[7.9064]→[7.365:427](∅→∅)
  + local s = Text.cut_selection_and_record_undo_event(State)
• edit in edit.lua at line 351
  [7.9035]

  [7.365]
  + elseif not readonly and chord == dm('x') then
• replacement in edit.lua at line 357
  [7.9310]→[7.515:561](∅→∅),[7.9310]→[7.1326:1357](∅→∅)
  − elseif not readonly and chord == 'C-v' then

  − elseif chord == dm('v') then
  [7.9310]

  [7.9446]
  + elseif not readonly and chord == dm('v') then
• edit in edit.lua at line 454
  [7.12430]→[7.1359:1359](∅→∅),[7.3203]→[7.807:841](∅→∅),[7.3203]→[7.807:841](∅→∅),[7.3203]→[7.807:841](∅→∅)
  −

  − local dm = App.default_modifier
• resolve order conflict in edit.lua at line 454
  [7.12430]