resolve conflicts

akkartik

Oct 30, 2024, 4:02 AM

HZENSQEQGMLUZFVGO2X3EGGU2CQ4DWFRQ5BIKAXW4PGD3TEBAG7AC

Dependencies

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

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