summaryrefslogtreecommitdiff
path: root/fnl/plugins/git-conflicts.fnl
blob: 3898dac88609ca7957129e70c6e7c0f709318e63 (plain)
1
2
3
;; Resolve git conflicts.

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