resolve conflicts

akkartik

Dec 19, 2023, 6:05 AM

W4IC4QIZV4AROXG4LDQOXBXEHNX66WP4BMXL4BWUKU6JGZFIWD4QC

Dependencies

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

Change contents

• file deletion: source_text.lua (----------)source_text.lua (----------)
  [4.2]→[4.147125:147164](∅→∅),[4.2]→[4.147125:147164](∅→∅),[4.147164]→[4.83786:83786](∅→∅)
  − button(State, 'link', {x=State.left+lo, y=y, w=hi-lo, h=State.line_height,

  − icon = icon.hyperlink_decoration,

  − onpress1 = function()

  − if file_exists(filename) then

  − source.switch_to_file(filename)

  − end

  − end,

  − })