akkartik/view.love - Change Z5YWHQMLYU5NRV4JT23OLPRKOKWCXQIYXRTROTGTGQRV2X6AVFGQC

Fork of lines.love for browsing read-only text files; useful starting point for further forks

resolve conflicts

Created by akkartik on February 18, 2025

Z5YWHQMLYU5NRV4JT23OLPRKOKWCXQIYXRTROTGTGQRV2X6AVFGQC

Dependencies

In channels

main

Change contents

Replacement in undo.lua at line 4 [5.1]

B:BD[4.177] → [4.177:250]

  if seen and seen[obj] then return seen[obj] end
  local s = seen or {}

[4.177]

[4.250]

  seen = seen or {}
  if seen[obj] then return seen[obj] end

Replacement in undo.lua at line 7 [5.1]
B:BD[4.303] → [4.303:321]
```
  s[obj] = result
```
[4.303]
[4.321]
```
  seen[obj] = result
```

Replacement in undo.lua at line 9 [5.1]

B:BD[4.348] → [4.348:392]

    result[deepcopy(k, s)] = deepcopy(v, s)

[4.348]

[4.392]

    result[deepcopy(k, seen)] = deepcopy(v, seen)

Deletion in undo.lua at line 17 [5.1]
B:BD[4.483] → [2.2:2]
B:BD[5.2498] → [3.0:61]
BD:BD[5.2498] → [3.0:61]
B:BD[5.2624] → [3.62:83]
BD:BD[5.2624] → [3.62:83]
B:BD[5.2669] → [3.84:134]
BD:BD[5.2669] → [3.84:134]
```
  seen = seen or {}
  if seen[obj] then return seen[obj] end
  seen[obj] = result
    result[deepcopy(k, seen)] = deepcopy(v, seen)
```
Solving an order conflict in undo.lua at line 17 [5.1]
[4.483]