diff options
| author | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2023-09-22 23:58:52 +0200 |
|---|---|---|
| committer | Gustaf Rydholm <gustaf.rydholm@gmail.com> | 2023-09-22 23:58:52 +0200 |
| commit | cc8adce9d8a7dd63bc639b3e2d3e71d82ee1713f (patch) | |
| tree | cd77460de3a22c37bf31b072b1e7490fb341965b /fnl/plugins/editor/git-conflicts.fnl | |
| parent | db5bc4eacc3f8283b9de42df688dc12149358d96 (diff) | |
Add git-conflicts
Diffstat (limited to 'fnl/plugins/editor/git-conflicts.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} |