resolve conflict

akkartik

Dec 3, 2024, 10:37 PM

DKL7KWKOUODAEOYR2I7DS6DGOJP47MVESRPMZYKIH6HLQW2GVCIAC

Dependencies

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

Change contents

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

[4.2]→[4.165788:165827](∅→∅),[4.165827]→[4.152503:152503](∅→∅),[4.2]→[4.165788:165827](∅→∅)

Text.right(State)
Text.search_next(State)
end