Maddison Hellstrom abe08d5283
feat: pick conflict under cursor (#355)
Added `cc` which picks the conflict under the cursor, if there is one.
2024-08-29 02:25:45 -04:00
..