diff options
| author | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2024-05-11 22:49:26 +0200 |
|---|---|---|
| committer | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2024-05-11 22:49:26 +0200 |
| commit | 04c2b6c07fdf711d983a9afd4d1ca5deb84d2102 (patch) | |
| tree | 86247bb23bc5f02f7f6e57d71fc76734ff904c01 /fnl/plugins/git-conflict.fnl | |
| parent | 92291b8dd1e1bea07404a34eb83c89a095e5b3a8 (diff) | |
Rename git-conflict
Diffstat (limited to 'fnl/plugins/git-conflict.fnl')
| -rw-r--r-- | fnl/plugins/git-conflict.fnl | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/fnl/plugins/git-conflict.fnl b/fnl/plugins/git-conflict.fnl new file mode 100644 index 0000000..df3285e --- /dev/null +++ b/fnl/plugins/git-conflict.fnl @@ -0,0 +1,13 @@ +;; Resolve git conflicts. + +(local keys [{1 :<leader>gi + 2 :<cmd>GitConflictListQf<cr> + :desc "Git Conflict Quick Fix"} + {1 :<leader>gg + 2 :<cmd>GitConflictRefresh<cr> + :desc "Git Conflict Refresh"}]) + +{1 :akinsho/git-conflict.nvim + :version "*" + :config true + : keys} |