akkartik/pothi.love - Change BVQQZUNRFPGCFM44G6CRAFNV2CPKHGFRYRMCUO4HJABFMKDKKOZAC

resolve conflicts

Created by akkartik on August 16, 2025

BVQQZUNRFPGCFM44G6CRAFNV2CPKHGFRYRMCUO4HJABFMKDKKOZAC

Dependencies

In channels

main

Change contents

Replacement in text_tests_love12.lua at line 104 [7.46]
∅:D[6.274] → [7.4843:4901]
B:BD[7.4843] → [7.4843:4901]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[6.274]
[7.4901]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love12.lua at line 115 [7.46]
∅:D[6.313] → [7.5263:5321]
B:BD[7.5263] → [7.5263:5321]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[6.313]
[7.5321]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love12.lua at line 126 [7.46]
∅:D[6.352] → [7.5675:5733]
B:BD[7.5675] → [7.5675:5733]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[6.352]
[7.5733]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love12.lua at line 137 [7.46]
∅:D[6.391] → [7.6092:6150]
B:BD[7.6092] → [7.6092:6150]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[6.391]
[7.6150]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love12.lua at line 148 [7.46]
∅:D[6.430] → [7.6521:6579]
B:BD[7.6521] → [7.6521:6579]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[6.430]
[7.6579]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love12.lua at line 159 [7.46]
∅:D[6.469] → [7.6925:6983]
B:BD[7.6925] → [7.6925:6983]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[6.469]
[7.6983]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love12.lua at line 171 [7.46]
∅:D[6.508] → [7.7352:7412]
B:BD[7.7352] → [7.7352:7412]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
[6.508]
[7.7412]
```
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
```
Replacement in text_tests_love12.lua at line 182 [7.46]
∅:D[6.547] → [7.7761:7821]
B:BD[7.7761] → [7.7761:7821]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
[6.547]
[7.7821]
```
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
```
Replacement in text_tests_love12.lua at line 193 [7.46]
∅:D[6.586] → [7.8180:8240]
B:BD[7.8180] → [7.8180:8240]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
[6.586]
[7.8240]
```
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
```
Replacement in text_tests_love12.lua at line 204 [7.46]
∅:D[6.625] → [7.8607:8667]
B:BD[7.8607] → [7.8607:8667]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
[6.625]
[7.8667]
```
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
```
Replacement in text_tests_love12.lua at line 215 [7.46]
∅:D[6.664] → [7.9009:9069]
B:BD[7.9009] → [7.9009:9069]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
[6.664]
[7.9069]
```
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
```
Replacement in text_tests_love11.lua at line 104 [7.87655]
∅:D[8.275] → [7.92452:92510]
B:BD[7.92452] → [7.92452:92510]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[8.275]
[7.92510]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love11.lua at line 115 [7.87655]
∅:D[8.314] → [7.92872:92930]
B:BD[7.92872] → [7.92872:92930]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[8.314]
[7.92930]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love11.lua at line 126 [7.87655]
∅:D[8.353] → [7.93284:93342]
B:BD[7.93284] → [7.93284:93342]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[8.353]
[7.93342]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love11.lua at line 137 [7.87655]
∅:D[8.392] → [7.93701:93759]
B:BD[7.93701] → [7.93701:93759]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[8.392]
[7.93759]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love11.lua at line 148 [7.87655]
∅:D[8.431] → [7.94130:94188]
B:BD[7.94130] → [7.94130:94188]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[8.431]
[7.94188]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love11.lua at line 159 [7.87655]
∅:D[8.470] → [7.94534:94592]
B:BD[7.94534] → [7.94534:94592]
```
  edit.run_after_keychord(Editor_state, 'M-left', 'left')
```
[8.470]
[7.94592]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
```
Replacement in text_tests_love11.lua at line 171 [7.87655]
∅:D[8.509] → [7.94961:95021]
B:BD[7.94961] → [7.94961:95021]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
[8.509]
[7.95021]
```
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
```
Replacement in text_tests_love11.lua at line 182 [7.87655]
∅:D[8.548] → [7.95370:95430]
B:BD[7.95370] → [7.95370:95430]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
[8.548]
[7.95430]
```
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
```
Replacement in text_tests_love11.lua at line 193 [7.87655]
∅:D[8.587] → [7.95789:95849]
B:BD[7.95789] → [7.95789:95849]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
[8.587]
[7.95849]
```
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
```
Replacement in text_tests_love11.lua at line 204 [7.87655]
∅:D[8.626] → [7.96216:96276]
B:BD[7.96216] → [7.96216:96276]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
[8.626]
[7.96276]
```
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
```
Replacement in text_tests_love11.lua at line 215 [7.87655]
∅:D[8.665] → [7.96618:96678]
B:BD[7.96618] → [7.96618:96678]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
```
[8.665]
[7.96678]
```
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
```
Deletion in text_tests.lua at line 2 [10.2]
B:BD[9.274] → [2.2:60]
BD:BD[9.274] → [2.2:60]
BD:BD[9.274] → [2.2:60]
∅:D[11.5] → [12.989:1038]
∅:D[2.60] → [12.989:1038]
∅:D[13.479] → [12.989:1038]
B:BD[14.475] → [12.989:1038]
D:D[13.479] → [12.989:1038]
BD:BD[14.475] → [12.989:1038]
B:BD[9.313] → [2.61:119]
BD:BD[9.313] → [2.61:119]
BD:BD[9.313] → [2.61:119]
∅:D[11.7] → [12.1039:1088]
∅:D[2.119] → [12.1039:1088]
∅:D[13.538] → [12.1039:1088]
B:BD[14.526] → [12.1039:1088]
D:D[13.538] → [12.1039:1088]
BD:BD[14.526] → [12.1039:1088]
B:BD[9.352] → [2.120:178]
BD:BD[9.352] → [2.120:178]
BD:BD[9.352] → [2.120:178]
∅:D[11.9] → [12.1089:1138]
∅:D[2.178] → [12.1089:1138]
∅:D[13.597] → [12.1089:1138]
B:BD[14.577] → [12.1089:1138]
D:D[13.597] → [12.1089:1138]
BD:BD[14.577] → [12.1089:1138]
B:BD[9.391] → [2.179:237]
BD:BD[9.391] → [2.179:237]
BD:BD[9.391] → [2.179:237]
∅:D[11.11] → [12.1139:1188]
∅:D[2.237] → [12.1139:1188]
∅:D[13.656] → [12.1139:1188]
B:BD[14.628] → [12.1139:1188]
D:D[13.656] → [12.1139:1188]
BD:BD[14.628] → [12.1139:1188]
B:BD[9.430] → [2.238:296]
BD:BD[9.430] → [2.238:296]
BD:BD[9.430] → [2.238:296]
∅:D[11.13] → [12.1189:1238]
∅:D[2.296] → [12.1189:1238]
∅:D[13.715] → [12.1189:1238]
B:BD[14.679] → [12.1189:1238]
D:D[13.715] → [12.1189:1238]
BD:BD[14.679] → [12.1189:1238]
B:BD[9.469] → [2.297:355]
BD:BD[9.469] → [2.297:355]
BD:BD[9.469] → [2.297:355]
∅:D[11.15] → [12.1239:1335]
∅:D[2.355] → [12.1239:1335]
∅:D[13.774] → [12.1239:1335]
B:BD[14.730] → [12.1239:1335]
D:D[13.774] → [12.1239:1335]
BD:BD[14.730] → [12.1239:1335]
B:BD[9.508] → [2.356:416]
BD:BD[9.508] → [2.356:416]
BD:BD[9.508] → [2.356:416]
∅:D[11.17] → [12.1336:1385]
∅:D[2.416] → [12.1336:1385]
∅:D[13.835] → [12.1336:1385]
B:BD[14.782] → [12.1336:1385]
D:D[13.835] → [12.1336:1385]
BD:BD[14.782] → [12.1336:1385]
B:BD[9.547] → [2.417:477]
BD:BD[9.547] → [2.417:477]
BD:BD[9.547] → [2.417:477]
∅:D[11.19] → [12.1386:1435]
∅:D[2.477] → [12.1386:1435]
∅:D[13.896] → [12.1386:1435]
B:BD[14.834] → [12.1386:1435]
D:D[13.896] → [12.1386:1435]
BD:BD[14.834] → [12.1386:1435]
B:BD[9.586] → [2.478:538]
BD:BD[9.586] → [2.478:538]
BD:BD[9.586] → [2.478:538]
∅:D[11.21] → [12.1436:1485]
∅:D[2.538] → [12.1436:1485]
∅:D[13.957] → [12.1436:1485]
B:BD[14.886] → [12.1436:1485]
D:D[13.957] → [12.1436:1485]
BD:BD[14.886] → [12.1436:1485]
B:BD[9.625] → [2.539:599]
BD:BD[9.625] → [2.539:599]
BD:BD[9.625] → [2.539:599]
∅:D[11.23] → [12.1486:1535]
∅:D[2.599] → [12.1486:1535]
∅:D[13.1018] → [12.1486:1535]
B:BD[14.938] → [12.1486:1535]
D:D[13.1018] → [12.1486:1535]
BD:BD[14.938] → [12.1486:1535]
B:BD[9.664] → [2.600:660]
BD:BD[9.664] → [2.600:660]
BD:BD[9.664] → [2.600:660]
∅:D[11.25] → [12.1536:1632]
∅:D[2.660] → [12.1536:1632]
∅:D[13.1079] → [12.1536:1632]
B:BD[14.990] → [12.1536:1632]
D:D[13.1079] → [12.1536:1632]
BD:BD[14.990] → [12.1536:1632]
```
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
  check_eq(Editor_state.cursor1.pos, 1, 'check')
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
  check_eq(Editor_state.cursor1.pos, 1, 'check')
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
  check_eq(Editor_state.cursor1.pos, 1, 'check')
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
  check_eq(Editor_state.cursor1.pos, 9, 'check')
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
  check_eq(Editor_state.cursor1.pos, 1, 'check')
  edit.run_after_keychord(Editor_state, 'C-left', 'left')
  check_eq(Editor_state.cursor1.line, 1, 'line')
  check_eq(Editor_state.cursor1.pos, 5, 'pos')
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
  check_eq(Editor_state.cursor1.pos, 4, 'check')
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
  check_eq(Editor_state.cursor1.pos, 8, 'check')
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
  check_eq(Editor_state.cursor1.pos, 4, 'check')
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
  check_eq(Editor_state.cursor1.pos, 9, 'check')
  edit.run_after_keychord(Editor_state, 'C-right', 'right')
  check_eq(Editor_state.cursor1.line, 2, 'line')
  check_eq(Editor_state.cursor1.pos, 4, 'pos')
```
Deletion in text.lua at line 1042 [16.1]
B:BD[15.442] → [3.146:146]
Deletion in conf.lua at line 3 [18.33]
B:BD[17.40] → [5.20:20]
BD:BD[17.40] → [5.20:20]
Solving an order conflict in conf.lua at line 3 [18.33]
[4.42]
[19.233]

resolve conflicts

Dependencies

In channels

Change contents

Replacement in text_tests_love12.lua at line 104 [7.46]

Replacement in text_tests_love12.lua at line 115 [7.46]

Replacement in text_tests_love12.lua at line 126 [7.46]

Replacement in text_tests_love12.lua at line 137 [7.46]

Replacement in text_tests_love12.lua at line 148 [7.46]

Replacement in text_tests_love12.lua at line 159 [7.46]

Replacement in text_tests_love12.lua at line 171 [7.46]

Replacement in text_tests_love12.lua at line 182 [7.46]

Replacement in text_tests_love12.lua at line 193 [7.46]

Replacement in text_tests_love12.lua at line 204 [7.46]

Replacement in text_tests_love12.lua at line 215 [7.46]

Replacement in text_tests_love11.lua at line 104 [7.87655]

Replacement in text_tests_love11.lua at line 115 [7.87655]

Replacement in text_tests_love11.lua at line 126 [7.87655]

Replacement in text_tests_love11.lua at line 137 [7.87655]

Replacement in text_tests_love11.lua at line 148 [7.87655]

Replacement in text_tests_love11.lua at line 159 [7.87655]

Replacement in text_tests_love11.lua at line 171 [7.87655]

Replacement in text_tests_love11.lua at line 182 [7.87655]

Replacement in text_tests_love11.lua at line 193 [7.87655]

Replacement in text_tests_love11.lua at line 204 [7.87655]

Replacement in text_tests_love11.lua at line 215 [7.87655]

Deletion in text_tests.lua at line 2 [10.2]

Deletion in text.lua at line 1042 [16.1]

Deletion in conf.lua at line 3 [18.33]

Solving an order conflict in conf.lua at line 3 [18.33]