resolve conflicts

akkartik

Jan 7, 2026, 5:39 AM

F7YD5D7I4PLEP6HPJZATKPULPKB5XX5EMNXQNJXNYFE2ZKYGPGCAC

Dependencies

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

Change contents

file deletion: source_text.lua (----------)source_text.lua (----------)

[4.2]→[4.147125:147164](∅→∅),[4.2]→[4.147125:147164](∅→∅),[4.147164]→[4.83786:83786](∅→∅)

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