resolve conflicts

akkartik

Sep 1, 2024, 8:29 AM

BDUAJA6TR6ZK3CIQAP3NXX7VWOAWQ7DOJFLM75YJYTCCJP7Z6VQQC

Dependencies

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

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](∅→∅)