summaryrefslogtreecommitdiff
path: root/fnl/plugins
diff options
context:
space:
mode:
authorGustaf Rydholm <gustaf.rydholm@gmail.com>2024-04-13 18:25:12 +0200
committerGustaf Rydholm <gustaf.rydholm@gmail.com>2024-04-13 18:25:12 +0200
commit1b1950fe58cf9657d2a92a86484a6fa2897ddd8b (patch)
treea6ff597c30745b8121d52acbc790cc10a58f444f /fnl/plugins
parent7b25fe41d3f7c3ba665aec7db086b39adf98cbd1 (diff)
Keymap for git-conflicts
Diffstat (limited to 'fnl/plugins')
-rw-r--r--fnl/plugins/git-conflicts.fnl7
1 files changed, 6 insertions, 1 deletions
diff --git a/fnl/plugins/git-conflicts.fnl b/fnl/plugins/git-conflicts.fnl
index 3898dac..11b5d2d 100644
--- a/fnl/plugins/git-conflicts.fnl
+++ b/fnl/plugins/git-conflicts.fnl
@@ -1,3 +1,8 @@
;; Resolve git conflicts.
-{1 :akinsho/git-conflict.nvim :event :BufReadPre :version "*" :config true}
+
+(local keys [{1 "<leader>gg"
+ 2 "<cmd>GitConflictRefresh<cr>"
+ :desc "Git Conflict Refresh"}])
+
+{1 :akinsho/git-conflict.nvim :event :BufReadPre :version "*" :config true : keys}