akkartik/view.love - Change NLKCEYW3UILNF3BSADTZP5TGIYS535WUNGZ7ATOXGOLR5BIFLKUQC

resolve conflicts

Created by akkartik on February 4, 2024

NLKCEYW3UILNF3BSADTZP5TGIYS535WUNGZ7ATOXGOLR5BIFLKUQC

Dependencies

In channels

main

Change contents

Deletion in text_tests.lua at line 16 [5.2]
B:BD[4.451] → [3.69:135]
BD:BD[4.451] → [3.69:135]
BD:BD[4.451] → [3.69:135]
```
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
```
Deletion in text_tests.lua at line 18 [5.2]
B:BD[7.2724] → [3.136:188]
BD:BD[7.2724] → [3.136:188]
```
  edit.run_after_keychord(Editor_state, 'C-m', 'm')
```
Deletion in text_tests.lua at line 592 [5.2]
B:BD[8.332] → [3.1253:1305]
BD:BD[8.332] → [3.1253:1305]
BD:BD[8.332] → [3.1253:1305]
B:BD[8.923] → [3.1306:1358]
BD:BD[8.923] → [3.1306:1358]
B:BD[9.795] → [3.1359:1425]
BD:BD[9.795] → [3.1359:1425]
B:BD[10.71] → [3.1426:1486]
BD:BD[10.71] → [3.1426:1486]
BD:BD[10.71] → [3.1426:1486]
```
  edit.run_after_keychord(Editor_state, 'C-x', 'x')
  edit.run_after_keychord(Editor_state, 'C-v', 'v')
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
  edit.run_after_keychord(Editor_state, 'return', 'return')
```
Solving an order conflict in text_tests.lua at line 592 [5.2]
[2.279]
[11.1488]
Deletion in text_tests.lua at line 594 [5.2]
B:BD[11.1841] → [3.1487:1547]
BD:BD[11.1841] → [3.1487:1547]
BD:BD[11.1841] → [3.1487:1547]
B:BD[5.5115] → [3.1548:1600]
BD:BD[5.5115] → [3.1548:1600]
BD:BD[5.5115] → [3.1548:1600]
```
  edit.run_after_keychord(Editor_state, 'return', 'return')
  edit.run_after_keychord(Editor_state, 'C-v', 'v')
```
Deletion in text_tests.lua at line 752 [5.2]
B:BD[12.383] → [3.1654:1706]
BD:BD[12.383] → [3.1654:1706]
```
  edit.run_after_keychord(Editor_state, 'C-x', 'x')
```
Deletion in text_tests.lua at line 1226 [5.2]
B:BD[5.29525] → [3.2993:3053]
BD:BD[5.29525] → [3.2993:3053]
BD:BD[5.29525] → [3.2993:3053]
B:BD[5.30763] → [3.3054:3114]
BD:BD[5.30763] → [3.3054:3114]
BD:BD[5.30763] → [3.3054:3114]
```
  edit.run_after_keychord(Editor_state, 'return', 'return')
  edit.run_after_keychord(Editor_state, 'return', 'return')
```
Deletion in text_tests.lua at line 1346 [5.2]
B:BD[5.34032] → [3.3343:3409]
BD:BD[5.34032] → [3.3343:3409]
BD:BD[5.34032] → [3.3343:3409]
B:BD[5.35209] → [3.3410:3476]
BD:BD[5.35209] → [3.3410:3476]
B:BD[11.2537] → [3.3477:3543]
BD:BD[11.2537] → [3.3477:3543]
BD:BD[11.2537] → [3.3477:3543]
B:BD[5.36505] → [3.3544:3610]
BD:BD[5.36505] → [3.3544:3610]
BD:BD[5.36505] → [3.3544:3610]
B:BD[5.37331] → [3.3611:3677]
BD:BD[5.37331] → [3.3611:3677]
BD:BD[5.37331] → [3.3611:3677]
B:BD[5.38224] → [3.3678:3744]
BD:BD[5.38224] → [3.3678:3744]
BD:BD[5.38224] → [3.3678:3744]
B:BD[5.39134] → [3.3745:3811]
BD:BD[5.39134] → [3.3745:3811]
BD:BD[5.39134] → [3.3745:3811]
B:BD[5.40038] → [3.3812:3878]
BD:BD[5.40038] → [3.3812:3878]
BD:BD[5.40038] → [3.3812:3878]
B:BD[5.41483] → [3.3879:3931]
BD:BD[5.41483] → [3.3879:3931]
BD:BD[5.41483] → [3.3879:3931]
B:BD[5.42354] → [3.3932:3998]
BD:BD[5.42354] → [3.3932:3998]
BD:BD[5.42354] → [3.3932:3998]
B:BD[5.43065] → [3.3999:4051]
BD:BD[5.43065] → [3.3999:4051]
BD:BD[5.43065] → [3.3999:4051]
B:BD[13.584] → [3.4052:4156]
BD:BD[13.584] → [3.4052:4156]
```
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
  edit.run_after_keychord(Editor_state, 'C-z', 'z')
  edit.run_after_keychord(Editor_state, 'backspace', 'backspace')
  edit.run_after_keychord(Editor_state, 'C-z', 'z')
  edit.run_after_keychord(Editor_state, 'C-z', 'z')
  edit.run_after_keychord(Editor_state, 'C-z', 'z')
```

resolve conflicts

Dependencies

In channels

Change contents

Deletion in text_tests.lua at line 16 [5.2]

Deletion in text_tests.lua at line 18 [5.2]

Deletion in text_tests.lua at line 592 [5.2]

Solving an order conflict in text_tests.lua at line 592 [5.2]

Deletion in text_tests.lua at line 594 [5.2]

Deletion in text_tests.lua at line 752 [5.2]

Deletion in text_tests.lua at line 1226 [5.2]

Deletion in text_tests.lua at line 1346 [5.2]