resolve conflicts
Created by akkartik on August 16, 2025
BYFC3K36BD65XRT7FSK6HRWX5S7MPIQ5WCMVGFBKBF3AOPYQHEAQC Dependencies
- [2]
XZ6QAC5XUPXIBNH4ZC5VL456HWTMGFRVXSCD7ZUZ6OVBAITKZDDAC - [3]
EWWIFR6PRJFDRO2D2DES5GEPQO5RZZECRHNCUJE45KO27VK6Q4FQC - [4]
WTNHAVK5BLTZIXNJR533GLVEC7K7IKG7EFHKR7C2QMRZRUTNSCYAC - [5]
MQCCBXP2CDFMLJALMRLYZ6IKER7AYKU6PPEGVY4GWCZUXSW6R7CQC - [6]
5X52XYQ37YTDFYWJTZLAUO6AWQZ6DXFBELMCYXDM736ASGWTIAVQC - [7]
CD7JC76CNHOBUJCJYWLGUDBZQTDSZ3F4J3T47RD3S5RPLEDCHBXAC - [8]
F4RUTONDM6GET6RT6ZBJKHJWJZWHJLCI2NM5ZMOFJGWAOEUCBDQQC - [9]
RLCO2SNKO5OJBEQFRXTB7TCAES6KML4IBOCW5SA7Q24RALW6JCWQC - [10]
ILOA5BYFTQKBSHLFMMZUVPQ2JXBFJD62ERQFBTDK2WSRXUN525VQC - [11]
GZ2OYPSHZU3FNO5HYP53EABOLM4C3TFPB5RGTIW2CJAWT6D2QXYQC - [12]
CZQ3NJ4NQYNXUV5GLD4RI5ISNDDWTUZIL5UA366M6WBHL6SA2EUAC - [13]
LXTTOB33N2HCUZFIUDRQGGBVHK2HODRG4NBLH6RXRQZDCHF27BSAC - [14]
FYJXSWXVSHXNII6UEG77UKQ6OSOMY2FRTAIROVJHUGAXN2HK5PPQC - [15]
ORRSP7FVCHI2TF5GXBRGQYYJAA3JFYXZBM3T663BKSBV22FCZVCAC - [16]
LNUHQOGHIOFGJXNGA3DZLYEASLYYDGLN2I3EDZY5ANASQAHCG3YQC - [17]
CYGNFOA5CP46F5A4JHWLLE2Y7IYTYUQ52XRYWTECTCUMT7PPL2NAC - [18]
2CK5QI7WA7M4IVSACFGOJYAIDKRUTZVMMPSFWEJTUNMWTN7AX4NAC - [19]
LF7BWEG4DKQI7NMXMZC4LC2BE5PB42HK5PD6OYBNIDMAZBJASOKQC - [20]
FHNPQBLKB5EEJA4XDF2QJBCKB4W56LYWHJLVYA7ZPUSKM27QWWNQC - [21]
MPLM5UH7A4SBA5O7KM42GSRKVG7MZ6H6CETAXMTDIZP4PJFLIYIAC - [22]
P6SYWBLBN2KAYQ6VJBPYZQNCD2WQHOZGC6XOKWW4SLAMFFGH3ZYQC - [23]
5BMR5HRT7GN5L4XB4ISP4JJP3ONZESHEEQBCTQE4EVEDL7MBSDGAC - [24]
EKKFWP4D2MNOHU265UCJU37KIFQV424CRLVASQMHDYUYY5T67D3QC - [25]
H3ECRBXFBASVUPMZYM5APUK6AR3UF2O6I7BF7KQPV3YHBNT6YZWQC - [26]
656FM555BRGLHJ7PTIZXD2IY5T7PGFEYSHG2T3Z7WNX6QZ5KROSAC - [27]
6RYLD5ONDIQFWU5CNL4NGHJQ2LNAZZFGTPXQJDNJGLNYAUOTUI7QC - [28]
YFW4MNNPY452RIUIGW6NO7WAUWPBXXOKOJJBNZGU727PUBZFATSAC - [29]
6XCJX4DZB6UEAXEXXUGVVPBCF5SNDYOJGU3Q6BPB4ZMI5DZH4MYQC - [30]
UFOVVX3ZFH3QBAGBUPNY7CO6WXC4LRD2E54YQVADK2LHKXKC7X4QC - [31]
7RKFA3VAGK73SLC3NCOKHVMOWLTC4EUQYS47P3LVVKDVLBVGBEHAC - [32]
Y4SPXCM3PKARGUU22FNBEDRU7S6CJSNYVAA76JYH4I4EMMMKP6LQC - [33]
FZBXBUFFNRE5ZJO5DLRU375HOXT2B7FO35XD7BTHHUXSARVWDFLQC - [34]
LLAOOMULEBXFMIGRBY6LRVEK4RXQGPNTFVWMCZNUEJZHWC7UGUEAC - [35]
MSOQI3A5BC5PY2MZXZQAQ4EQDT4KICQJPN3YUZVDYTWXSPZWBLIAC - [36]
AMOPICKVRHMQERJLFPMAAEBV7TL5QACGGSBJWRCMV5R5O3KDVETAC - [37]
4FTOQOPZLSWHIQ45X6BTMJ5RXP6NIOOYYYRBCXVMDADSTSJD4P6AC - [38]
O7YTBRQYVEM6LR22BJFPAGGF4CQP5R2C4B4KXVOTHUWA32TVZ6BQC - [39]
PLKNHYZ4KXWWKC2DHXCI4WVO23I7VMEVYT5H2J6JDE4S3D3CHDJQC - [40]
BULPIBEGL7TMK6CVIE7IS7WGAHGOSUJBGJSFQK542MOWGHP2ADQQC - [41]
ER5RKUWUTFDWWCZ4GLQLV2IF7DYV73B4VRNC4GDD6K34N5NBKZPAC - [42]
T42Y5MLOV7WMURTBEZTUVMYEVG72UMN6BPG2QHOYW7G2CC75ZNGQC - [43]
B4USRORMW7EQXOV4TOHRCMMWUURWAMJRDITEKA3YAV2SFUIFBXLQC
In channels
main
Change contents
Replacement in text_tests_love11.lua at line 6 [8.87655]
Replacement in text_tests_love11.lua at line 34 [8.87655]
Replacement in text_tests_love11.lua at line 57 [8.87655]
Replacement in text_tests_love11.lua at line 68 [8.87655]
Replacement in text_tests_love11.lua at line 79 [8.87655]
Replacement in text_tests_love11.lua at line 91 [8.87655]
Replacement in text_tests_love11.lua at line 103 [8.87655]
Replacement in text_tests_love11.lua at line 114 [8.87655]
Replacement in text_tests_love11.lua at line 125 [8.87655]
Replacement in text_tests_love11.lua at line 136 [8.87655]
Replacement in text_tests_love11.lua at line 147 [8.87655]
Replacement in text_tests_love11.lua at line 158 [8.87655]
Replacement in text_tests_love11.lua at line 170 [8.87655]
Replacement in text_tests_love11.lua at line 181 [8.87655]
Replacement in text_tests_love11.lua at line 192 [8.87655]
Replacement in text_tests_love11.lua at line 203 [8.87655]
Replacement in text_tests_love11.lua at line 214 [8.87655]
Replacement in text_tests_love11.lua at line 228 [8.87655]
Replacement in text_tests_love11.lua at line 247 [8.87655]
Replacement in text_tests_love11.lua at line 266 [8.87655]
Replacement in text_tests_love11.lua at line 284 [8.87655]
Replacement in text_tests_love11.lua at line 302 [8.87655]
Replacement in text_tests_love11.lua at line 318 [8.87655]
Replacement in text_tests_love11.lua at line 334 [8.87655]
Replacement in text_tests_love11.lua at line 350 [8.87655]
Replacement in text_tests_love11.lua at line 368 [8.87655]
Replacement in text_tests_love11.lua at line 386 [8.87655]
Replacement in text_tests_love11.lua at line 402 [8.87655]
Replacement in text_tests_love11.lua at line 419 [8.87655]
Replacement in text_tests_love11.lua at line 437 [8.87655]
Replacement in text_tests_love11.lua at line 459 [8.87655]
Replacement in text_tests_love11.lua at line 479 [8.87655]
Replacement in text_tests_love11.lua at line 502 [8.87655]
Replacement in text_tests_love11.lua at line 526 [8.87655]
Replacement in text_tests_love11.lua at line 544 [8.87655]
Replacement in text_tests_love11.lua at line 566 [8.87655]
Replacement in text_tests_love11.lua at line 583 [8.87655]
Replacement in text_tests_love11.lua at line 599 [8.87655]
Replacement in text_tests_love11.lua at line 620 [8.87655]
Replacement in text_tests_love11.lua at line 637 [8.87655]
Replacement in text_tests_love11.lua at line 654 [8.87655]
Replacement in text_tests_love11.lua at line 672 [8.87655]
Replacement in text_tests_love11.lua at line 695 [8.87655]
Replacement in text_tests_love11.lua at line 713 [8.87655]
Replacement in text_tests_love11.lua at line 757 [8.87655]
Replacement in text_tests_love11.lua at line 786 [8.87655]
Replacement in text_tests_love11.lua at line 805 [8.87655]
Replacement in text_tests_love11.lua at line 822 [8.87655]
Replacement in text_tests_love11.lua at line 843 [8.87655]
Replacement in text_tests_love11.lua at line 864 [8.87655]
Replacement in text_tests_love11.lua at line 888 [8.87655]
Replacement in text_tests_love11.lua at line 916 [8.87655]
Replacement in text_tests_love11.lua at line 938 [8.87655]
Replacement in text_tests_love11.lua at line 953 [8.87655]
Replacement in text_tests_love11.lua at line 976 [8.87655]
Replacement in text_tests_love11.lua at line 1003 [8.87655]
Replacement in text_tests_love11.lua at line 1018 [8.87655]
Replacement in text_tests_love11.lua at line 1046 [8.87655]
Replacement in text_tests_love11.lua at line 1073 [8.87655]
Replacement in text_tests_love11.lua at line 1101 [8.87655]
Replacement in text_tests_love11.lua at line 1128 [8.87655]
Replacement in text_tests_love11.lua at line 1161 [8.87655]
Replacement in text_tests_love11.lua at line 1189 [8.87655]
Replacement in text_tests_love11.lua at line 1216 [8.87655]
Replacement in text_tests_love11.lua at line 1243 [8.87655]
Replacement in text_tests_love11.lua at line 1272 [8.87655]
Replacement in text_tests_love11.lua at line 1299 [8.87655]
Replacement in text_tests_love11.lua at line 1322 [8.87655]
Replacement in text_tests_love11.lua at line 1350 [8.87655]
Replacement in text_tests_love11.lua at line 1376 [8.87655]
Replacement in text_tests_love11.lua at line 1404 [8.87655]
Replacement in text_tests_love11.lua at line 1426 [8.87655]
Replacement in text_tests_love11.lua at line 1444 [8.87655]
Replacement in text_tests_love11.lua at line 1475 [8.87655]
Replacement in text_tests_love11.lua at line 1503 [8.87655]
Replacement in text_tests_love11.lua at line 1532 [8.87655]
Replacement in text_tests_love11.lua at line 1560 [8.87655]
Replacement in text_tests_love11.lua at line 1588 [8.87655]
Replacement in text_tests_love11.lua at line 1621 [8.87655]
Replacement in text_tests_love11.lua at line 1648 [8.87655]
Replacement in text_tests_love11.lua at line 1783 [8.87655]
Replacement in text_tests_love11.lua at line 1854 [8.87655]
Replacement in text_tests_love11.lua at line 1874 [8.87655]
Replacement in text_tests_love11.lua at line 1900 [8.87655]
Replacement in text_tests_love11.lua at line 1917 [8.87655]
Replacement in text_tests_love11.lua at line 1934 [8.87655]
Replacement in text_tests_love11.lua at line 1951 [8.87655]
Replacement in text_tests_love11.lua at line 1965 [8.87655]
Deletion in text_tests.lua at line 2 [13.2]
edit.draw(Editor_state, Text_color)check_eq(#Editor_state.lines, 1, '#lines')check_eq(Editor_state.cursor1.line, 1, 'cursor:line')check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')check_eq(Editor_state.screen_top1.line, 1, 'screen_top:line')check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos')edit.draw(Editor_state, Text_color)edit.run_after_text_input(Editor_state, 'a')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'left', 'left')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'right', 'right')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'left', 'left')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'right', 'right')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-left', 'left')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-left', 'left')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-left', 'left')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-left', 'left')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-left', 'left')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-left', 'left')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-right', 'right')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-right', 'right')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-right', 'right')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-right', 'right')edit.draw(Editor_state, Text_color)edit.run_after_keychord(Editor_state, 'M-right', 'right')Editor_state.selection1 = {}edit.draw(Editor_state, Text_color) -- populate line_cache.startpos for each lineedit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)check_eq(Editor_state.cursor1.line, 1, 'cursor:line')check_eq(Editor_state.cursor1.pos, 2, 'cursor:pos')-- selection is empty to avoid perturbing future editscheck_nil(Editor_state.selection1.line, 'selection:line')check_nil(Editor_state.selection1.pos, 'selection:pos')edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.run_after_text_input(Editor_state, 'g')edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)endedit.draw(Editor_state, Text_color) -- populate line_cache.startpos for each lineedit.draw(Editor_state, Text_color) -- populate line_cache.startpos for each lineEditor_state.lines = load_array{'abc', 'defgh', 'xyz'}Text.redraw_all(Editor_state)Editor_state.cursor1 = {line=2, pos=5}Editor_state.screen_top1 = {line=2, pos=3}-- press mouse above first line of textedit.draw(Editor_state, Text_color)edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)-- selection is at screen topcheck(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')check_eq(Editor_state.selection1.line, 2, 'selection:line')check_eq(Editor_state.selection1.pos, 3, 'selection:pos')-- I'd like to test what happens when a mouse click is below some page of-- text, potentially even in the middle of a line.-- However, it's brittle to set up a text line boundary just right.-- So I'm going to just check things below the bottom of the final line of-- text when it's in the middle of the screen.-- final screen line ends in the middle of screenApp.screen.init{width=50, height=60}Editor_state = edit.initialize_test_state()Editor_state.lines = load_array{'abcde'}Text.redraw_all(Editor_state)Editor_state.cursor1 = {line=1, pos=1}Editor_state.screen_top1 = {line=1, pos=1}edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color) -- populate line_cache.startpos for each lineedit.draw(Editor_state, Text_color) -- populate line_cache.startpos for each lineedit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)Deletion in text_tests.lua at line 12 [13.2]
Deletion in text_tests.lua at line 19 [13.2]
edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.run_after_text_input(Editor_state, 'g')edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)edit.draw(Editor_state, Text_color)Deletion in text.lua at line 1036 [40.1]
Deletion in conf.lua at line 3 [42.33]
Solving an order conflict in conf.lua at line 3 [42.33]