Added diffview for git merges
This commit is contained in:
parent
03bc8b2268
commit
51ec4ef527
1 changed files with 4 additions and 0 deletions
|
|
@ -111,6 +111,7 @@ local plugins = {
|
||||||
end
|
end
|
||||||
|
|
||||||
},
|
},
|
||||||
|
-- Git tooling
|
||||||
{
|
{
|
||||||
"kdheepak/lazygit.nvim",
|
"kdheepak/lazygit.nvim",
|
||||||
cmd = {
|
cmd = {
|
||||||
|
|
@ -123,6 +124,9 @@ local plugins = {
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"sindrets/diffview.nvim"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue