From 08d0ab6a4c0256c3e57776d5dc30f21af31fcb0f Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sat, 13 Apr 2024 18:30:55 +0200 Subject: Add quick fix keymap for git-conflicts --- fnl/plugins/git-conflicts.fnl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'fnl/plugins') 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 :gg +(local keys [{1 :gi + 2 :GitConflictListQf + :desc "Git Conflict Quick Fix"} + {1 :gg 2 :GitConflictRefresh :desc "Git Conflict Refresh"}]) -- cgit v1.2.3-70-g09d2