resolve conflicts

akkartik

Oct 30, 2024, 4:01 AM

5CXVR5QITXCTFJHEP26QKKG2OVLZFQOSJBHS7FPGZBC4Y4LLBR6QC

Dependencies

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

Change contents

• file un-deletion: source_edit.lua (----------)source_edit.lua (----------)
  [3.165827]→[3.152503:152503](∅→∅),[3.2]→[3.165788:165827](∅→∅),[3.2]→[3.165788:165827](∅→∅)