summaryrefslogtreecommitdiff
path: root/fnl/plugins/git-conflicts.fnl
diff options
context:
space:
mode:
authorGustaf Rydholm <gustaf.rydholm@gmail.com>2024-01-05 01:50:20 +0100
committerGustaf Rydholm <gustaf.rydholm@gmail.com>2024-01-05 01:50:20 +0100
commit2a94573f54c69a9af7536586ab2c03eb88bda5e7 (patch)
tree48e430773d56baef8c751fb8a6b4d76303b61636 /fnl/plugins/git-conflicts.fnl
parent16198ca3bcd0ddd61f8d18280769c6f226b2b7ce (diff)
Refactor
Diffstat (limited to 'fnl/plugins/git-conflicts.fnl')
-rw-r--r--fnl/plugins/git-conflicts.fnl3
1 files changed, 3 insertions, 0 deletions
diff --git a/fnl/plugins/git-conflicts.fnl b/fnl/plugins/git-conflicts.fnl
new file mode 100644
index 0000000..4a4583b
--- /dev/null
+++ b/fnl/plugins/git-conflicts.fnl
@@ -0,0 +1,3 @@
+;; Resolve git conflicts.
+
+{1 :akinsho/git-conflict.nvim :event :BufReadPre :tag "v1.0.0" :config true}