zoriya/flake
1
0
Fork 0
mirror of https://github.com/zoriya/flake.git synced 2026-06-01 10:15:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use better mappings for git conflict

Browse Source
This commit is contained in:
Zoe Roux
2025-01-03 18:26:36 +01:00
parent 4c76f8759f
commit 9ca5886a9c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nvim/lua/plugins/git.lua
+6 -6
View File
@@ -42,12 +42,12 @@ return {
"git-conflict.nvim",
lazy = false,
keys = {
{ "<leader>gxo", "<Plug>(git-conflict-ours)", desc = "Accept ours" },
{ "<leader>gxt", "<Plug>(git-conflict-theirs)", desc = "Accept theirs" },
{ "<leader>gxb", "<Plug>(git-conflict-both)", desc = "Accept both" },
{ "<leader>gx0", "<Plug>(git-conflict-none)", desc = "Accept none" },
{ "[x", "<Plug>(git-conflict-prev-conflict)", desc = "Previous conflict" },
{ "]x", "<Plug>(git-conflict-next-conflict)", desc = "Next conflict" },
{ "c<", "<Plug>(git-conflict-our)", desc = "Accept ours (top one)" },
{ "c>", "<Plug>(git-conflict-theirs)", desc = "Accept their (bottom one)" },
{ "c=", "<Plug>(git-conflict-both)", desc = "Accept both" },
{ "cd", "<Plug>(git-conflict-none)", desc = "Accept none" },
{ "[x", "<Plug>(git-conflict-prev-conflict)", desc = "Previous conflict" },
{ "]x", "<Plug>(git-conflict-next-conflict)", desc = "Next conflict" },
},
opts = {
default_mappings = false,