return { { -- LazyGit 'kdheepak/lazygit.nvim', cmd = { 'LazyGit', 'LazyGitConfig', 'LazyGitCurrentFile', 'LazyGitFilter', 'LazyGitFilterCurrentFile', }, -- optional for floating window border decoration dependencies = { 'nvim-lua/plenary.nvim', }, -- setting the keybinding for LazyGit with 'keys' is recommended in -- order to load the plugin when the command is run for the first time keys = { { 'lg', 'LazyGit', desc = 'LazyGit' }, }, }, { 'akinsho/git-conflict.nvim', version = '*', config = true, opts = { 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', }, }, }, }