diff options
| author | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2024-04-13 18:25:53 +0200 |
|---|---|---|
| committer | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2024-04-13 18:25:53 +0200 |
| commit | d0f68299f62a294fb4cf1df9d38d62f45c4dfbb3 (patch) | |
| tree | 39f85f05fe490f5bb57f6d21e0408123787e80b2 /fnl/plugins | |
| parent | 8fb6ac63dd99651e73baed1580e0fe10353b6788 (diff) | |
Format
Diffstat (limited to 'fnl/plugins')
| -rw-r--r-- | fnl/plugins/git-conflicts.fnl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fnl/plugins/git-conflicts.fnl b/fnl/plugins/git-conflicts.fnl index 11b5d2d..1c6e438 100644 --- a/fnl/plugins/git-conflicts.fnl +++ b/fnl/plugins/git-conflicts.fnl @@ -1,8 +1,11 @@ ;; Resolve git conflicts. - -(local keys [{1 "<leader>gg" - 2 "<cmd>GitConflictRefresh<cr>" +(local keys [{1 :<leader>gg + 2 :<cmd>GitConflictRefresh<cr> :desc "Git Conflict Refresh"}]) -{1 :akinsho/git-conflict.nvim :event :BufReadPre :version "*" :config true : keys} +{1 :akinsho/git-conflict.nvim + :event :BufReadPre + :version "*" + :config true + : keys} |