summaryrefslogtreecommitdiff
path: root/fnl/plugins/git-conflicts.fnl
blob: 11b5d2d50095b808a5169e82f1399604cec09072 (plain)
1
2
3
4
5
6
7
8
;; Resolve git conflicts.


(local keys [{1 "<leader>gg"
              2 "<cmd>GitConflictRefresh<cr>"
              :desc "Git Conflict Refresh"}])

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