1 files changed, 13 insertions, 0 deletions
diff --git a/fnl/plugins/git-conflict.fnl b/fnl/plugins/git-conflict.fnl
new file mode 100644
index 0000000..df3285e
--- /dev/null
+++ b/fnl/plugins/git-conflict.fnl
@@ -0,0 +1,13 @@
+;; 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
+ :version "*"
+ :config true
+ : keys}