akkartik/view.love - Change B6BY5FYTFENPVLSMWHYRXEEZRUT2FYEKC7XTKX5WJL2TWCIHUDZQC

resolve conflicts

Created by akkartik on January 22, 2024

B6BY5FYTFENPVLSMWHYRXEEZRUT2FYEKC7XTKX5WJL2TWCIHUDZQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 44 [4.1]

B:BD[2.694] → [2.694:798]

            Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)

[2.694]

[2.798]

            Text.pretend_draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Deletion in text.lua at line 47 [4.1]

∅:D[2.925] → [5.3:107]

B:BD[6.869] → [5.3:107]

B:BD[7.169] → [8.4:112]

BD:BD[7.169] → [8.4:112]

B:BD[7.571] → [8.113:221]

BD:BD[7.571] → [8.113:221]

            Text.pretend_draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)
            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)
            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Solving an order conflict in text.lua at line 47 [4.1]
[2.925]

Insertion in text.lua at line 47 [4.1]

[0.121]

[9.530]

            Text.pretend_draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Deletion in help.lua at line 147 [11.6622]
B:BD[10.9454] → [3.3567:3567]
BD:BD[10.9454] → [3.3567:3567]