akkartik/driver.love - Change L4BVZQWHJKZH6LSZZNJKMZYSQMRRUCW3IDUKY3WBWFQIUPMQADZQC

resolve conflicts

Created by akkartik on February 4, 2024

L4BVZQWHJKZH6LSZZNJKMZYSQMRRUCW3IDUKY3WBWFQIUPMQADZQC

Dependencies

In channels

main

Change contents

Deletion in text_tests.lua at line 109 [6.2]
B:BD[4.274] → [5.2:52]
B:BD[5.52] → [2.5:5]
B:BD[4.274] → [3.11:11]
∅:D[3.11] → [7.421:479]
B:BD[8.258] → [7.421:479]
```
  edit.run_after_keychord(Editor_state, 'C-left')
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Resurrecting zombie bytes in text_tests.lua at line 109 [6.2]
∅:∅[2.5] → [9.989:1038]
∅:∅[7.479] → [9.989:1038]
B:B[10.475] → [9.989:1038]
BD:B[10.475] → [9.989:1038]
```
  check_eq(Editor_state.cursor1.pos, 1, 'check')
```

Insertion in text_tests.lua at line 109 [6.2]

[4.274]

[9.989]

  edit.run_after_keychord(Editor_state, 'C-left', 'left')

Deletion in text_tests.lua at line 120 [6.2]
B:BD[4.313] → [5.53:103]
B:BD[5.103] → [2.7:7]
B:BD[4.313] → [3.13:13]
∅:D[3.13] → [7.480:538]
B:BD[8.285] → [7.480:538]
```
  edit.run_after_keychord(Editor_state, 'C-left')
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Resurrecting zombie bytes in text_tests.lua at line 120 [6.2]
∅:∅[2.7] → [9.1039:1088]
∅:∅[7.538] → [9.1039:1088]
B:B[10.526] → [9.1039:1088]
BD:B[10.526] → [9.1039:1088]
```
  check_eq(Editor_state.cursor1.pos, 1, 'check')
```

Insertion in text_tests.lua at line 120 [6.2]

[4.313]

[9.1039]

  edit.run_after_keychord(Editor_state, 'C-left', 'left')

Deletion in text_tests.lua at line 131 [6.2]
B:BD[4.352] → [5.104:154]
B:BD[5.154] → [2.9:9]
B:BD[4.352] → [3.15:15]
∅:D[3.15] → [7.539:597]
B:BD[8.312] → [7.539:597]
```
  edit.run_after_keychord(Editor_state, 'C-left')
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Resurrecting zombie bytes in text_tests.lua at line 131 [6.2]
∅:∅[2.9] → [9.1089:1138]
∅:∅[7.597] → [9.1089:1138]
B:B[10.577] → [9.1089:1138]
BD:B[10.577] → [9.1089:1138]
```
  check_eq(Editor_state.cursor1.pos, 1, 'check')
```

Insertion in text_tests.lua at line 131 [6.2]

[4.352]

[9.1089]

  edit.run_after_keychord(Editor_state, 'C-left', 'left')

Deletion in text_tests.lua at line 142 [6.2]
B:BD[4.391] → [5.155:205]
B:BD[5.205] → [2.11:11]
B:BD[4.391] → [3.17:17]
∅:D[3.17] → [7.598:656]
B:BD[8.339] → [7.598:656]
```
  edit.run_after_keychord(Editor_state, 'C-left')
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Resurrecting zombie bytes in text_tests.lua at line 142 [6.2]
∅:∅[2.11] → [9.1139:1188]
∅:∅[7.656] → [9.1139:1188]
B:B[10.628] → [9.1139:1188]
BD:B[10.628] → [9.1139:1188]
```
  check_eq(Editor_state.cursor1.pos, 9, 'check')
```

Insertion in text_tests.lua at line 142 [6.2]

[4.391]

[9.1139]

  edit.run_after_keychord(Editor_state, 'C-left', 'left')

Deletion in text_tests.lua at line 153 [6.2]
B:BD[4.430] → [5.206:256]
B:BD[5.256] → [2.13:13]
B:BD[4.430] → [3.19:19]
∅:D[3.19] → [7.657:715]
B:BD[8.366] → [7.657:715]
```
  edit.run_after_keychord(Editor_state, 'C-left')
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Resurrecting zombie bytes in text_tests.lua at line 153 [6.2]
∅:∅[2.13] → [9.1189:1238]
∅:∅[7.715] → [9.1189:1238]
B:B[10.679] → [9.1189:1238]
BD:B[10.679] → [9.1189:1238]
```
  check_eq(Editor_state.cursor1.pos, 1, 'check')
```

Insertion in text_tests.lua at line 153 [6.2]

[4.430]

[9.1189]

  edit.run_after_keychord(Editor_state, 'C-left', 'left')

Deletion in text_tests.lua at line 164 [6.2]
B:BD[4.469] → [5.257:307]
B:BD[5.307] → [2.15:15]
B:BD[4.469] → [3.21:21]
∅:D[3.21] → [7.716:774]
B:BD[8.393] → [7.716:774]
```
  edit.run_after_keychord(Editor_state, 'C-left')
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
Resurrecting zombie bytes in text_tests.lua at line 164 [6.2]
∅:∅[2.15] → [9.1239:1335]
∅:∅[7.774] → [9.1239:1335]
B:B[10.730] → [9.1239:1335]
BD:B[10.730] → [9.1239:1335]
```
  check_eq(Editor_state.cursor1.line, 1, 'line')
  check_eq(Editor_state.cursor1.pos, 5, 'pos')
```

Insertion in text_tests.lua at line 164 [6.2]

[4.469]

[9.1239]

  edit.run_after_keychord(Editor_state, 'C-left', 'left')

Deletion in text_tests.lua at line 176 [6.2]
B:BD[4.508] → [5.308:359]
B:BD[5.359] → [2.17:17]
B:BD[4.508] → [3.23:23]
∅:D[3.23] → [7.775:835]
B:BD[8.420] → [7.775:835]
```
  edit.run_after_keychord(Editor_state, 'C-right')
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
Resurrecting zombie bytes in text_tests.lua at line 176 [6.2]
∅:∅[2.17] → [9.1336:1385]
∅:∅[7.835] → [9.1336:1385]
B:B[10.782] → [9.1336:1385]
BD:B[10.782] → [9.1336:1385]
```
  check_eq(Editor_state.cursor1.pos, 4, 'check')
```

Insertion in text_tests.lua at line 176 [6.2]

[4.508]

[9.1336]

  edit.run_after_keychord(Editor_state, 'C-right', 'right')

Deletion in text_tests.lua at line 187 [6.2]
B:BD[4.547] → [5.360:411]
B:BD[5.411] → [2.19:19]
B:BD[4.547] → [3.25:25]
∅:D[3.25] → [7.836:896]
B:BD[8.447] → [7.836:896]
```
  edit.run_after_keychord(Editor_state, 'C-right')
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
Resurrecting zombie bytes in text_tests.lua at line 187 [6.2]
∅:∅[2.19] → [9.1386:1435]
∅:∅[7.896] → [9.1386:1435]
B:B[10.834] → [9.1386:1435]
BD:B[10.834] → [9.1386:1435]
```
  check_eq(Editor_state.cursor1.pos, 8, 'check')
```

Insertion in text_tests.lua at line 187 [6.2]

[4.547]

[9.1386]

  edit.run_after_keychord(Editor_state, 'C-right', 'right')

Deletion in text_tests.lua at line 198 [6.2]
B:BD[4.586] → [5.412:463]
B:BD[5.463] → [2.21:21]
B:BD[4.586] → [3.27:27]
∅:D[3.27] → [7.897:957]
B:BD[8.474] → [7.897:957]
```
  edit.run_after_keychord(Editor_state, 'C-right')
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
Resurrecting zombie bytes in text_tests.lua at line 198 [6.2]
∅:∅[2.21] → [9.1436:1485]
∅:∅[7.957] → [9.1436:1485]
B:B[10.886] → [9.1436:1485]
BD:B[10.886] → [9.1436:1485]
```
  check_eq(Editor_state.cursor1.pos, 4, 'check')
```

Insertion in text_tests.lua at line 198 [6.2]

[4.586]

[9.1436]

  edit.run_after_keychord(Editor_state, 'C-right', 'right')

Deletion in text_tests.lua at line 209 [6.2]
B:BD[4.625] → [5.464:515]
B:BD[5.515] → [2.23:23]
B:BD[4.625] → [3.29:29]
∅:D[3.29] → [7.958:1018]
B:BD[8.501] → [7.958:1018]
```
  edit.run_after_keychord(Editor_state, 'C-right')
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
Resurrecting zombie bytes in text_tests.lua at line 209 [6.2]
∅:∅[2.23] → [9.1486:1535]
∅:∅[7.1018] → [9.1486:1535]
B:B[10.938] → [9.1486:1535]
BD:B[10.938] → [9.1486:1535]
```
  check_eq(Editor_state.cursor1.pos, 9, 'check')
```

Insertion in text_tests.lua at line 209 [6.2]

[4.625]

[9.1486]

  edit.run_after_keychord(Editor_state, 'C-right', 'right')

Deletion in text_tests.lua at line 220 [6.2]
B:BD[4.664] → [5.516:567]
B:BD[5.567] → [2.25:25]
B:BD[4.664] → [3.31:31]
∅:D[3.31] → [7.1019:1079]
B:BD[8.528] → [7.1019:1079]
```
  edit.run_after_keychord(Editor_state, 'C-right')
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
Resurrecting zombie bytes in text_tests.lua at line 220 [6.2]
∅:∅[2.25] → [9.1536:1632]
∅:∅[7.1079] → [9.1536:1632]
B:B[10.990] → [9.1536:1632]
BD:B[10.990] → [9.1536:1632]
```
  check_eq(Editor_state.cursor1.line, 2, 'line')
  check_eq(Editor_state.cursor1.pos, 4, 'pos')
```

Insertion in text_tests.lua at line 220 [6.2]

[4.664]

[9.1536]

  edit.run_after_keychord(Editor_state, 'C-right', 'right')

resolve conflicts

Dependencies

In channels

Change contents

Deletion in text_tests.lua at line 109 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 109 [6.2]

Insertion in text_tests.lua at line 109 [6.2]

Deletion in text_tests.lua at line 120 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 120 [6.2]

Insertion in text_tests.lua at line 120 [6.2]

Deletion in text_tests.lua at line 131 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 131 [6.2]

Insertion in text_tests.lua at line 131 [6.2]

Deletion in text_tests.lua at line 142 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 142 [6.2]

Insertion in text_tests.lua at line 142 [6.2]

Deletion in text_tests.lua at line 153 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 153 [6.2]

Insertion in text_tests.lua at line 153 [6.2]

Deletion in text_tests.lua at line 164 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 164 [6.2]

Insertion in text_tests.lua at line 164 [6.2]

Deletion in text_tests.lua at line 176 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 176 [6.2]

Insertion in text_tests.lua at line 176 [6.2]

Deletion in text_tests.lua at line 187 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 187 [6.2]

Insertion in text_tests.lua at line 187 [6.2]

Deletion in text_tests.lua at line 198 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 198 [6.2]

Insertion in text_tests.lua at line 198 [6.2]

Deletion in text_tests.lua at line 209 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 209 [6.2]

Insertion in text_tests.lua at line 209 [6.2]

Deletion in text_tests.lua at line 220 [6.2]

Resurrecting zombie bytes in text_tests.lua at line 220 [6.2]

Insertion in text_tests.lua at line 220 [6.2]