resolve conflicts

akkartik

Oct 30, 2024, 4:02 AM

HZENSQEQGMLUZFVGO2X3EGGU2CQ4DWFRQ5BIKAXW4PGD3TEBAG7AC

Dependencies

[2] 3V2R6YS6 merge bugfix
[3] FHZ5AG3M resolve conflicts
[4] 5CXVR5QI resolve conflicts
[5] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[6] RXMHAZ6V resolve conflicts
[7] D2GCFTTT clean up repl functionality
[8] 73OCE2MC after much struggle, a brute-force undo
[9] 4YDBYBA4 clean up memory leak experiments
[10] 57HKHZ7Z include the tool that's mentioned in representation.md
[11] S7CSVBHZ resolve conflicts
[12] VP5KC4XZ Merge lines.love
[13] ZLJYLPOT Merge lines.love
[14] VHUNJHXB Merge lines.love
[15] CE4LZV4T drop last couple of manual tests
[16] ORKN6EOB Merge lines.love
[17] VHQCNMAR several more modules
[18] JOPVPUSA editing source code from within the app
[19] KKMFQDR4 editing source code from within the app
[20] UEG224LH debug animations
[21] RSZD5A7G forgot to add json.lua
[22] CZQ3NJ4N Merge text0
[23] SLMSBVJW resolve conflicts
[24] PJ5PQAQE record support for multiple versions
[25] 2L5MEZV3 experiment: new edit namespace
[26] 4SR3Z4Y3 document the version of LÖVE I've been using
[27] KKQKPGCI resolve conflicts
[28] 6VJTQKW7 start supporting LÖVE v12
[29] TBTRYEBP Merge lines.love
[30] 7LXXQBNE resolve conflicts
[31] OTIBCAUJ love2d scaffold
[32] 5OVKHVY6 nice way to make on.* handlers more discoverable
[33] BULPIBEG beginnings of a module for the text editor
[34] 2CFLXLIE Merge text.love
[35] K2X6G75Z start writing some tests for drawings
[36] 36Z442IV back to commit 8123959e52f without code editing
[37] CZ6X73VY merge bugfix
[38] SYWQBIO5 resolve conflicts
[39] VXRYVZ74 Merge text.love
[40] QXXISTGE resolve conflicts
[41] R6MNUXDJ pijul bug
[42] TVCPXAAU rename
[43] VXORMHME delete experimental REPL
[44] OGUV4HSA remove some memory leaks from rendered fragments
[45] T4FRZSYL delete an ancient, unused file
[46] 3PSFWAIL Merge lines.love
[47] SGMA5JLE save the list of tests in repo
[48] CAG7PP5Y Merge text.love
[49] QSHQIVF3 resolve conflicts
[50] KMSL74GA support selections in the source editor
[51] ED4Z6ORC cleaner API for file-system access
[52] FS2ITYYH record a known issue
[53] XX7G2FFJ intermingle freehand line drawings with text
[54] 4Y2QDDAZ resolve conflicts
[55] 66X36NZN a little more prose describing manual_tests
[56] AVTNUQYR basic test-enabled framework
[57] MBAJPTDJ resolve conflicts
[58] KJLZCK2R resolve conflicts
[59] VLTU33KW resolve conflicts
[60] LXTTOB33 extract a couple of files
[61] KQ22RW43 resolve conflicts
[62] TOXPJJYY resolve conflicts
[63] 2DVVKKVA flesh out Readme
[64] LRDM35CE app running again
[65] OL7ZCZWD Merge text.love
[66] N2NUGNN4 include a brief reference enabling many useful apps
[67] 6LJZN727 handle chords
[68] PCHTG7YU resolve conflicts
[69] R5QXEHUI somebody stop me
[70] LWPFEZBI Merge lines.love
[71] SW5GN5LP suggest a default layout for freewheeling apps
[72] TLOAPLBJ add a license
[73] EZHO4TSW new file-system format for freewheeling apps
[74] BLWAYPKV extract a module
[75] 3QNOKBFM beginnings of a test harness
[76] D43U7GQ4 alter on-disk representation (manifest files)

Change contents

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

[5.2]→[5.165788:165827](∅→∅),[5.2]→[5.165788:165827](∅→∅),[5.165827]→[5.152503:152503](∅→∅),[5.2]→[5.165788:165827](∅→∅),[5.2]→[5.165788:165827](∅→∅),[5.2]→[5.165788:165827](∅→∅),[5.2]→[5.165788:165827](∅→∅),[5.165827]→[5.152503:152503](∅→∅)

Text.right(State)
Text.search_next(State)
end