buliway/nixos-private-dots
1
0
Fork 0
Code Issues 7 Pull requests Projects 1 Releases Packages Wiki Activity

delete git-conflict.nvim

Browse source
This commit is contained in:
Buliway 2025-01-08 21:59:57 +03:00
parent bcd37e9ae3
commit db1ebe9aa5
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nvim/lua/custom/plugins/git.lua
View file

@ -1,20 +1,4 @@
return { return {
-- {
-- 'akinsho/git-conflict.nvim',
-- version = '*',
-- config = function()
-- require('git-conflict').setup {
-- default_mappings = false, -- disable buffer local mapping created by this plugin
-- default_commands = true, -- disable commands created by this plugin
-- disable_diagnostics = false, -- This will disable the diagnostics in a buffer whilst it is conflicted
-- list_opener = 'copen', -- command or function to open the conflicts list
-- highlights = { -- They must have background color, otherwise the default color will be used
-- incoming = 'DiffAdd',
-- current = 'DiffText',
-- },
-- }
-- end,
-- },
{ {
'sindrets/diffview.nvim', 'sindrets/diffview.nvim',
}, },