akkartik/mastodon-unfurl.love - Change A27ZAO4OND7CPGMS6PHEQQCX5WR3WC22PCA7HERX7M4X6GRTKYHQC

resolve conflicts

Created by akkartik 2 days ago

A27ZAO4OND7CPGMS6PHEQQCX5WR3WC22PCA7HERX7M4X6GRTKYHQC

Dependencies

In channels

main

Change contents

File deletion: source_text.lua, source_text.lua
BFD:BFD[4.2] → [5.147062:147101]
BFD:BFD[4.2] → [5.147062:147101]
BFD:BFD[5.147101] → [5.83723:83723]
B:BD[6.21361] → [3.147:246]
B:BD[5.101653] → [3.247:293]
∅:D[3.293] → [5.101692:101765]
∅:D[3.246] → [6.21361:21382]
```
      return
    end
    if State.cursor1.line == 1 and State.cursor1.pos == 1 then
      -- no-op
    else
      assert(State.cursor1.line > 1)
      before = snapshot(State, State.cursor1.line-1, State.cursor1.line)
      return
    end
```

Insertion in source_text.lua at line 277 [8.83786]

[7.21361]

[7.21361]

      return
    end
    if State.cursor1.line == 1 and State.cursor1.pos == 1 then
      -- no-op

Replacement in source_text.lua at line 296 [8.83786]
B:BD[8.101716] → [8.101716:101755]
```
    elseif State.cursor1.line > 1 then
```
[8.101716]
[8.101755]
```
    else
      assert(State.cursor1.line > 1)
```