resolve conflicts

akkartik

Dec 9, 2023, 6:08 PM

LXR2FNDC2OZD2QDC77SHIDRT37NLIKAJVRJSYZX6VDBEQXXPSRYAC

Dependencies

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

Change contents

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

[4.2]→[4.147125:147164](∅→∅),[4.147164]→[4.83786:83786](∅→∅)

assert(false, ('Text.offset(%d) called on a string of length %d (byte size %d); this is likely a failure to handle utf8\n\n^%s$\n'):format(pos1, utf8.len(s), #s, s))
end