fnl/plugins/git-conflicts.fnl


1
2
3
4
5
6
7
8
9
10
11
12
13
14

;; Resolve git conflicts.

(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"}])

{1 :akinsho/git-conflict.nvim
 :event :BufReadPre
 :version "*"
 :config true
 : keys}