cargdev/lua-nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat adding all the files

Browse Source
This commit is contained in:
cg8936
2025-08-03 21:02:10 -04:00
parent 28410ecfab
commit 6738adc58b
17 changed files with 337 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lua/cargdev/core/keymaps/gitconflict.lua Normal file
View File

@@ -0,0 +1,10 @@
-- Git Conflict keymaps
local keymap = vim.keymap
keymap.set("n", "]x", "<Plug>(git-conflict-next-conflict)", { desc = "Go to next git conflict" })
keymap.set("n", "[x", "<Plug>(git-conflict-prev-conflict)", { desc = "Go to previous git conflict" })
keymap.set("n", "<leader>co", "<Plug>(git-conflict-ours)", { desc = "Choose ours (git conflict)" })
keymap.set("n", "<leader>ct", "<Plug>(git-conflict-theirs)", { desc = "Choose theirs (git conflict)" })
keymap.set("n", "<leader>cb", "<Plug>(git-conflict-both)", { desc = "Choose both (git conflict)" })
keymap.set("n", "<leader>c0", "<Plug>(git-conflict-none)", { desc = "Choose none (git conflict)" })
keymap.set("n", "<leader>cq", "<Plug>(git-conflict-list)", { desc = "List all git conflicts" })