summaryrefslogtreecommitdiff
path: root/fnl
diff options
context:
space:
mode:
authorGustaf Rydholm <gustaf.rydholm@gmail.com>2024-04-13 18:30:55 +0200
committerGustaf Rydholm <gustaf.rydholm@gmail.com>2024-04-13 18:30:55 +0200
commit08d0ab6a4c0256c3e57776d5dc30f21af31fcb0f (patch)
tree72ac24ee5b58427ac810e96fdd0029c5d3bc1231 /fnl
parentd0f68299f62a294fb4cf1df9d38d62f45c4dfbb3 (diff)
Add quick fix keymap for git-conflicts
Diffstat (limited to 'fnl')
-rw-r--r--fnl/plugins/git-conflicts.fnl5
1 files changed, 4 insertions, 1 deletions
diff --git a/fnl/plugins/git-conflicts.fnl b/fnl/plugins/git-conflicts.fnl
index 1c6e438..e1beacb 100644
--- a/fnl/plugins/git-conflicts.fnl
+++ b/fnl/plugins/git-conflicts.fnl
@@ -1,6 +1,9 @@
;; Resolve git conflicts.
-(local keys [{1 :<leader>gg
+(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"}])