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

{1 :akinsho/git-conflict.nvim :event :BufReadPre :tag "v1.0.0" :config true}