diff options
Diffstat (limited to 'fnl')
| -rw-r--r-- | fnl/plugins/editor/git-conflicts.fnl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fnl/plugins/editor/git-conflicts.fnl b/fnl/plugins/editor/git-conflicts.fnl new file mode 100644 index 0000000..4a4583b --- /dev/null +++ b/fnl/plugins/editor/git-conflicts.fnl @@ -0,0 +1,3 @@ +;; Resolve git conflicts. + +{1 :akinsho/git-conflict.nvim :event :BufReadPre :tag "v1.0.0" :config true} |