resolve conflicts

akkartik

Sep 1, 2024, 8:29 AM

BDUAJA6TR6ZK3CIQAP3NXX7VWOAWQ7DOJFLM75YJYTCCJP7Z6VQQC

Dependencies

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

Change contents

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

[3.147164]→[3.83786:83786](∅→∅),[3.2]→[3.147125:147164](∅→∅),[3.2]→[3.147125:147164](∅→∅)
file un-deletion: source_select.lua (----------)source_select.lua (----------)

[3.30091]→[3.23288:23288](∅→∅),[3.2]→[3.30050:30091](∅→∅),[3.2]→[3.30050:30091](∅→∅)
file un-deletion: source_edit.lua (----------)source_edit.lua (----------)

[3.165827]→[3.152503:152503](∅→∅),[3.2]→[3.165788:165827](∅→∅),[3.2]→[3.165788:165827](∅→∅)