resolve conflicts

akkartik

Dec 9, 2023, 6:08 PM

LXR2FNDC2OZD2QDC77SHIDRT37NLIKAJVRJSYZX6VDBEQXXPSRYAC

Dependencies

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

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