summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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"}])