resolve conflicts

akkartik

Aug 16, 2025, 10:44 PM

FDUYCS333CUL3T6T5EOMSHAWAFSEDAHQG7PXJA6IAJCLFZC6ZXKAC

Dependencies

[2] RLCO2SNK wrap lines like lines2 forks
[3] VDMXMEYC merge bugfix for LÖVE 12
[4] F4RUTOND split up editor tests between LÖVE 11 and LÖVE 12
[5] B4USRORM disable DPI scaling
[6] FYJXSWXV resolve conflicts

Change contents

replacement in text_tests_love12.lua at line 6

[3.231]→[3.231:257](∅→∅)

edit.draw(Editor_state)

[3.231]

[3.257]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 34

[3.2434]→[3.2434:2460](∅→∅)

edit.draw(Editor_state)

[3.2434]

[3.2460]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 57

[3.3173]→[3.3173:3199](∅→∅)

edit.draw(Editor_state)

[3.3173]

[3.3199]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 68

[3.3534]→[3.3534:3560](∅→∅)

edit.draw(Editor_state)

[3.3534]

[3.3560]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 79

[3.3922]→[3.3922:3948](∅→∅)

edit.draw(Editor_state)

[3.3922]

[3.3948]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 91

[3.4394]→[3.4394:4420](∅→∅)

edit.draw(Editor_state)

[3.4394]

[3.4420]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 103

[3.4817]→[3.4817:4843](∅→∅)

edit.draw(Editor_state)

[3.4817]

[3.4843]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 114

[3.5237]→[3.5237:5263](∅→∅)

edit.draw(Editor_state)

[3.5237]

[3.5263]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 125

[3.5649]→[3.5649:5675](∅→∅)

edit.draw(Editor_state)

[3.5649]

[3.5675]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 136

[3.6066]→[3.6066:6092](∅→∅)

edit.draw(Editor_state)

[3.6066]

[3.6092]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 147

[3.6495]→[3.6495:6521](∅→∅)

edit.draw(Editor_state)

[3.6495]

[3.6521]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 158

[3.6899]→[3.6899:6925](∅→∅)

edit.draw(Editor_state)

[3.6899]

[3.6925]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 170

[3.7326]→[3.7326:7352](∅→∅)

edit.draw(Editor_state)

[3.7326]

[3.7352]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 181

[3.7735]→[3.7735:7761](∅→∅)

edit.draw(Editor_state)

[3.7735]

[3.7761]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 192

[3.8154]→[3.8154:8180](∅→∅)

edit.draw(Editor_state)

[3.8154]

[3.8180]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 203

[3.8581]→[3.8581:8607](∅→∅)

edit.draw(Editor_state)

[3.8581]

[3.8607]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 214

[3.8983]→[3.8983:9009](∅→∅)

edit.draw(Editor_state)

[3.8983]

[3.9009]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 228

[3.9494]→[3.9494:9567](∅→∅)

edit.draw(Editor_state) -- populate line_cache.startpos for each line

[3.9494]

[3.9567]

edit.draw(Editor_state, Text_color) -- populate line_cache.startpos for each line
replacement in text_tests_love12.lua at line 247

[3.10343]→[3.10343:10369](∅→∅)

edit.draw(Editor_state)

[3.10343]

[3.10369]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 266

[3.11175]→[3.11175:11201](∅→∅)

edit.draw(Editor_state)

[3.11175]

[3.11201]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 284

[3.11909]→[3.11909:11935](∅→∅)

edit.draw(Editor_state)

[3.11909]

[3.11935]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 302

[3.12593]→[3.12593:12619](∅→∅)

edit.draw(Editor_state)

[3.12593]

[3.12619]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 318

[3.13259]→[3.13259:13285](∅→∅)

edit.draw(Editor_state)

[3.13259]

[3.13285]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 334

[3.13807]→[3.13807:13833](∅→∅)

edit.draw(Editor_state)

[3.13807]

[3.13833]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 350

[3.14358]→[3.14358:14384](∅→∅)

edit.draw(Editor_state)

[3.14358]

[3.14384]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 368

[3.15007]→[3.15007:15033](∅→∅)

edit.draw(Editor_state)

[3.15007]

[3.15033]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 386

[3.15833]→[3.15833:15859](∅→∅)

edit.draw(Editor_state)

[3.15833]

[3.15859]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 402

[3.16547]→[3.16547:16573](∅→∅)

edit.draw(Editor_state)

[3.16547]

[3.16573]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 419

[3.17203]→[3.17203:17229](∅→∅)

edit.draw(Editor_state)

[3.17203]

[3.17229]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 437

[3.17840]→[3.17840:17866](∅→∅)

edit.draw(Editor_state)

[3.17840]

[3.17866]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 459

[3.18817]→[3.18817:18843](∅→∅)

edit.draw(Editor_state)

[3.18817]

[3.18843]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 479

[3.19648]→[3.19648:19674](∅→∅)

edit.draw(Editor_state)

[3.19648]

[3.19674]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 502

[3.20664]→[3.20664:20690](∅→∅)

edit.draw(Editor_state)

[3.20664]

[3.20690]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 526

[3.21762]→[3.21762:21788](∅→∅)

edit.draw(Editor_state)

[3.21762]

[3.21788]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 544

[3.22470]→[3.22470:22496](∅→∅)

edit.draw(Editor_state)

[3.22470]

[3.22496]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 566

[3.23377]→[3.23377:23403](∅→∅)

edit.draw(Editor_state)

[3.23377]

[3.23403]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 583

[3.24031]→[3.24031:24057](∅→∅)

edit.draw(Editor_state)

[3.24031]

[3.24057]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 599

[3.24631]→[3.24631:24657](∅→∅)

edit.draw(Editor_state)

[3.24631]

[3.24657]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 620

[3.25438]→[3.25438:25464](∅→∅)

edit.draw(Editor_state)

[3.25438]

[3.25464]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 637

[3.26047]→[3.26047:26073](∅→∅)

edit.draw(Editor_state)

[3.26047]

[3.26073]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 654

[3.26655]→[3.26655:26681](∅→∅)

edit.draw(Editor_state)

[3.26655]

[3.26681]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 672

[3.27310]→[3.27310:27336](∅→∅)

edit.draw(Editor_state)

[3.27310]

[3.27336]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 695

[3.28212]→[3.28212:28238](∅→∅)

edit.draw(Editor_state)

[3.28212]

[3.28238]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 713

[3.28849]→[3.28849:28875](∅→∅)

edit.draw(Editor_state)

[3.28849]

[3.28875]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 757

[3.30617]→[3.30617:30643](∅→∅)

edit.draw(Editor_state)

[3.30617]

[3.30643]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 786

[3.31762]→[3.31762:31835](∅→∅)

edit.draw(Editor_state) -- populate line_cache.startpos for each line

[3.31762]

[3.31835]

edit.draw(Editor_state, Text_color) -- populate line_cache.startpos for each line
replacement in text_tests_love12.lua at line 805

[3.32696]→[3.32696:32769](∅→∅)

edit.draw(Editor_state) -- populate line_cache.startpos for each line

[3.32696]

[3.32769]

edit.draw(Editor_state, Text_color) -- populate line_cache.startpos for each line
replacement in text_tests_love12.lua at line 822

[3.33508]→[3.33508:33534](∅→∅)

edit.draw(Editor_state)

[3.33508]

[3.33534]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 843

[3.34516]→[3.34516:34542](∅→∅)

edit.draw(Editor_state)

[3.34516]

[3.34542]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 864

[3.35403]→[3.35403:35476](∅→∅)

edit.draw(Editor_state) -- populate line_cache.startpos for each line

[3.35403]

[3.35476]

edit.draw(Editor_state, Text_color) -- populate line_cache.startpos for each line
replacement in text_tests_love12.lua at line 888

[3.36609]→[3.36609:36682](∅→∅)

edit.draw(Editor_state) -- populate line_cache.startpos for each line

[3.36609]

[3.36682]

edit.draw(Editor_state, Text_color) -- populate line_cache.startpos for each line
replacement in text_tests_love12.lua at line 916

[3.38131]→[3.38131:38157](∅→∅)

edit.draw(Editor_state)

[3.38131]

[3.38157]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 938

[3.38958]→[3.38958:38984](∅→∅)

edit.draw(Editor_state)

[3.38958]

[3.38984]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 953

[3.39478]→[3.39478:39504](∅→∅)

edit.draw(Editor_state)

[3.39478]

[3.39504]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 976

[3.41939]→[3.41939:41965](∅→∅)

edit.draw(Editor_state)

[3.41939]

[3.41965]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1003

[2.1340]→[3.43055:43081](∅→∅),[3.43055]→[3.43055:43081](∅→∅)

edit.draw(Editor_state)

[2.1340]

[3.43081]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1018

[3.43663]→[3.43663:43689](∅→∅)

edit.draw(Editor_state)

[3.43663]

[3.43689]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1046

[3.45883]→[3.45883:45909](∅→∅)

edit.draw(Editor_state)

[3.45883]

[3.45909]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1073

[3.47031]→[3.47031:47057](∅→∅)

edit.draw(Editor_state)

[3.47031]

[3.47057]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1101

[3.48314]→[3.48314:48340](∅→∅)

edit.draw(Editor_state)

[3.48314]

[3.48340]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1128

[3.49466]→[3.49466:49492](∅→∅)

edit.draw(Editor_state)

[3.49466]

[3.49492]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1161

[3.50999]→[3.50999:51025](∅→∅)

edit.draw(Editor_state)

[3.50999]

[3.51025]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1189

[3.53181]→[3.53181:53207](∅→∅)

edit.draw(Editor_state)

[3.53181]

[3.53207]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1216

[2.2141]→[3.55243:55269](∅→∅),[3.55243]→[3.55243:55269](∅→∅)

edit.draw(Editor_state)

[2.2141]

[3.55269]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1243

[3.56413]→[3.56413:56439](∅→∅)

edit.draw(Editor_state)

[3.56413]

[3.56439]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1272

[3.57694]→[3.57694:57720](∅→∅)

edit.draw(Editor_state)

[3.57694]

[3.57720]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1299

[3.58729]→[3.58729:58755](∅→∅)

edit.draw(Editor_state)

[3.58729]

[3.58755]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1322

[3.59688]→[3.59688:59714](∅→∅)

edit.draw(Editor_state)

[3.59688]

[3.59714]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1350

[2.2363]→[3.60958:60984](∅→∅),[3.60958]→[3.60958:60984](∅→∅)

edit.draw(Editor_state)

[2.2363]

[3.60984]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1376

[3.62096]→[3.62096:62122](∅→∅)

edit.draw(Editor_state)

[3.62096]

[3.62122]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1404

[3.63279]→[3.63279:63305](∅→∅)

edit.draw(Editor_state)

[3.63279]

[3.63305]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1426

[3.64221]→[3.64221:64247](∅→∅)

edit.draw(Editor_state)

[3.64221]

[3.64247]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1444

[3.64996]→[3.64996:65022](∅→∅)

edit.draw(Editor_state)

[3.64996]

[3.65022]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1475

[2.2692]→[3.66308:66334](∅→∅),[3.66308]→[3.66308:66334](∅→∅)

edit.draw(Editor_state)

[2.2692]

[3.66334]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1503

[2.2924]→[3.67544:67570](∅→∅),[3.67544]→[3.67544:67570](∅→∅)

edit.draw(Editor_state)

[2.2924]

[3.67570]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1532

[2.3252]→[3.68816:68842](∅→∅),[3.68816]→[3.68816:68842](∅→∅)

edit.draw(Editor_state)

[2.3252]

[3.68842]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1560

[3.70034]→[3.70034:70060](∅→∅)

edit.draw(Editor_state)

[3.70034]

[3.70060]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1588

[3.71247]→[3.71247:71273](∅→∅)

edit.draw(Editor_state)

[3.71247]

[3.71273]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1621

[3.72763]→[3.72763:72789](∅→∅)

edit.draw(Editor_state)

[3.72763]

[3.72789]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1648

[2.3612]→[3.73902:73928](∅→∅),[3.73902]→[3.73902:73928](∅→∅)

edit.draw(Editor_state)

[2.3612]

[3.73928]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1783

[3.79939]→[3.79939:79965](∅→∅)

edit.draw(Editor_state)

[3.79939]

[3.79965]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1854

[3.83007]→[3.83007:83033](∅→∅)

edit.draw(Editor_state)

[3.83007]

[3.83033]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1874

[3.83821]→[3.83821:83847](∅→∅)

edit.draw(Editor_state)

[3.83821]

[3.83847]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1900

[3.84931]→[3.84931:84957](∅→∅)

edit.draw(Editor_state)

[3.84931]

[3.84957]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1917

[3.85612]→[3.85612:85638](∅→∅)

edit.draw(Editor_state)

[3.85612]

[3.85638]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1934

[3.86274]→[3.86274:86300](∅→∅)

edit.draw(Editor_state)

[3.86274]

[3.86300]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1951

[3.86930]→[3.86930:86956](∅→∅)

edit.draw(Editor_state)

[3.86930]

[3.86956]

edit.draw(Editor_state, Text_color)
replacement in text_tests_love12.lua at line 1965

[3.87427]→[3.87427:87453](∅→∅)

edit.draw(Editor_state)

[3.87427]

[3.87453]

edit.draw(Editor_state, Text_color)