resolve conflicts

akkartik

Jan 7, 2026, 5:30 AM

A27ZAO4OND7CPGMS6PHEQQCX5WR3WC22PCA7HERX7M4X6GRTKYHQC

Dependencies

• [2] PT7ICD7Z resolve conflicts
• [3] RM5MIEFZ bugfix
• [4] BLWAYPKV extract a module
• [5] VP5KC4XZ Merge lines.love
• [6] KMSL74GA support selections in the source editor
• [7] KKQKPGCI resolve conflicts
• [8] CE4LZV4T drop last couple of manual tests
• [9] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [10] RSZD5A7G forgot to add json.lua
• [11] T42Y5MLO explicitly specify app name
• [12] F4RUTOND split up editor tests between LÖVE 11 and LÖVE 12
• [13] XX7G2FFJ intermingle freehand line drawings with text
• [14] OTIBCAUJ love2d scaffold
• [15] 2EELKVO2 resolve conflicts
• [16] 66X36NZN a little more prose describing manual_tests
• [17] VXORMHME delete experimental REPL
• [18] VZPH3XJK update source editor
• [19] D4B52CQ2 Merge lines.love
• [20] 4YDBYBA4 clean up memory leak experiments
• [21] 3PSFWAIL Merge lines.love
• [22] 6VJTQKW7 start supporting LÖVE v12
• [23] RUB7L6GY resolve conflicts
• [24] KKMFQDR4 editing source code from within the app
• [25] 6LJZN727 handle chords
• [26] T4FRZSYL delete an ancient, unused file
• [27] K2X6G75Z start writing some tests for drawings
• [28] VHQCNMAR several more modules
• [29] JOPVPUSA editing source code from within the app
• [30] 4SR3Z4Y3 document the version of LÖVE I've been using
• [31] N2NUGNN4 include a brief reference enabling many useful apps
• [32] ZLJYLPOT Merge lines.love
• [33] AVTNUQYR basic test-enabled framework
• [34] SGMA5JLE save the list of tests in repo
• [35] D2GCFTTT clean up repl functionality
• [36] ORKN6EOB Merge lines.love
• [37] ED4Z6ORC cleaner API for file-system access
• [38] R5QXEHUI somebody stop me
• [39] MBAJPTDJ resolve conflicts
• [40] 2CTN2IEF Merge lines.love
• [41] FYJXSWXV resolve conflicts
• [42] LXTTOB33 extract a couple of files
• [43] FS2ITYYH record a known issue
• [44] 2L5MEZV3 experiment: new edit namespace
• [45] VHUNJHXB Merge lines.love
• [46] 6TBU3VTN explicitly state when operations manage undo
• [47] FBBHEUQN resolve conflicts
• [48] OGUV4HSA remove some memory leaks from rendered fragments
• [49] 73OCE2MC after much struggle, a brute-force undo
• [50] LWPFEZBI Merge lines.love
• [51] OI4FPFIN support drawings in the source editor
• [52] BULPIBEG beginnings of a module for the text editor
• [53] TLOAPLBJ add a license
• [54] 3QNOKBFM beginnings of a test harness
• [55] TVCPXAAU rename

Change contents

• file deletion: source_text.lua (----------)source_text.lua (----------)
  [4.2]→[4.147062:147101](∅→∅),[4.2]→[4.147062:147101](∅→∅),[4.147101]→[4.83723:83723](∅→∅)
  − return

  − end

  − if State.cursor1.line == 1 and State.cursor1.pos == 1 then

  − -- no-op

  − else

  − assert(State.cursor1.line > 1)

  − before = snapshot(State, State.cursor1.line-1, State.cursor1.line)

  − return

  − end
• edit in source_text.lua at line 277
  [4.21361]

  [4.21361]
  + return

  + end

  + if State.cursor1.line == 1 and State.cursor1.pos == 1 then

  + -- no-op
• replacement in source_text.lua at line 296
  [4.101716]→[4.101716:101755](∅→∅)
  − elseif State.cursor1.line > 1 then
  [4.101716]

  [4.101755]
  + else

  + assert(State.cursor1.line > 1)