resolve conflicts

akkartik

Feb 8, 2024, 10:57 AM

55QWALUNCWBMSGDURYFK5W2TKQLVWKTEANEB75MU33ANU7HVGRRAC

Dependencies

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

Change contents

• file un-deletion: source_text_tests.lua (----------)source_text_tests.lua (----------)
  [3.83784]→[3.3561:3561](∅→∅),[3.2]→[3.83739:83784](∅→∅),[3.2]→[3.83739:83784](∅→∅)
• file un-deletion: source_text.lua (----------)source_text.lua (----------)
  [3.147164]→[3.83786:83786](∅→∅),[3.2]→[3.147125:147164](∅→∅),[3.2]→[3.147125:147164](∅→∅)