CarGDev/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: pick conflict under cursor (#355)

Browse Source 
Added `cc` which picks the conflict under the cursor, if there is one.
This commit is contained in:
Maddison Hellstrom
2024-08-28 23:25:45 -07:00
committed by GitHub
parent 5c1861d93f
commit abe08d5283
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -107,6 +107,7 @@ _See [config.lua#L9](./lua/avante/config.lua) for the full config_
ours = "co",
theirs = "ct",
both = "cb",
cursor = "cc",
next = "]x",
prev = "[x",
},
@@ -203,6 +204,7 @@ The following key bindings are available for use with `avante.nvim`:
| <kbd>c</kbd><kbd>o</kbd> | choose ours |
| <kbd>c</kbd><kbd>t</kbd> | choose theirs |
| <kbd>c</kbd><kbd>b</kbd> | choose both |
| <kbd>c</kbd><kbd>c</kbd> | choose cursor |
| <kbd>c</kbd><kbd>0</kbd> | choose none |
| <kbd>]</kbd><kbd>x</kbd> | move to previous conflict |
| <kbd>[</kbd><kbd>x</kbd> | move to next conflict |