NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-11-12 08:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git/git-conflict: avoid shadowing builtin keybinds

Browse source
This commit is contained in:
Ching Pei Yang 2025-02-18 19:35:19 +01:00 • committed by Ching Pei Yang
commit 0c4dc0f100
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/plugins/git/git-conflict/git-conflict.nix
View file

@ -12,10 +12,10 @@ in {
setupOpts = mkPluginSetupOption "git-conflict" {}; setupOpts = mkPluginSetupOption "git-conflict" {};
mappings = { mappings = {
ours = mkMappingOption "Choose Ours [Git-Conflict]" "co"; ours = mkMappingOption "Choose Ours [Git-Conflict]" "<leader>co";
theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "ct"; theirs = mkMappingOption "Choose Theirs [Git-Conflict]" "<leader>ct";
both = mkMappingOption "Choose Both [Git-Conflict]" "cb"; both = mkMappingOption "Choose Both [Git-Conflict]" "<leader>cb";
none = mkMappingOption "Choose None [Git-Conflict]" "c0"; none = mkMappingOption "Choose None [Git-Conflict]" "<leader>c0";
prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x"; prevConflict = mkMappingOption "Go to the previous Conflict [Git-Conflict]" "]x";
nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x"; nextConflict = mkMappingOption "Go to the next Conflict [Git-Conflict]" "[x";
}; };