feat: pick conflict under cursor (#355)

Added `cc` which picks the conflict under the cursor, if there is one.
2024-08-28 23:25:45 -07:00
parent 5c1861d93f
commit abe08d5283
3 changed files with 26 additions and 2 deletions
--- a/lua/avante/config.lua
+++ b/lua/avante/config.lua
@@ -97,6 +97,7 @@ M.defaults = {
      theirs = "ct",
      none = "c0",
      both = "cb",
+      cursor = "cc",
      next = "]x",
      prev = "[x",
    },