init.lua: ae23056

2 files changed, 2 insertions(+), 0 deletions(-)

feat(plugins): add git-conflict

Author: Smirnov Oleksandr ss2316544@gmail.com

Committed at: 2023-06-13 01:26:08 +0300

Parent: adb2329

jump to

M	lazy-lock.json
M	lua/plugins/git.lua

M lazy-lock.json

@@ -11,6 +11,7 @@ "conjure": { "branch": "develop", "commit": "704eee1a960e8bef0cebd2063fa66c35f852a8ac" },
   "debugprint.nvim": { "branch": "main", "commit": "3e27d34a767063033ca17e7e9d65c5cfae615354" },
   "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
   "friendly-snippets": { "branch": "main", "commit": "0eb246a7dbb06d3d9e560696be210241cc27c081" },
+  "git-conflict.nvim": { "branch": "main", "commit": "3c89812a83ac749b8851a473863958325a1cd57c" },
   "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" },
   "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
   "lazy.nvim": { "branch": "main", "commit": "678179543e0d27650c328d8659f2c2cab4d854ef" },

M lua/plugins/git.lua

@@ -1,5 +1,6 @@
 local map = require("core.utils").smap
 return {
+  { "akinsho/git-conflict.nvim", config = true },
   {
     "lewis6991/gitsigns.nvim",
     event = "BufRead",