Nvim: add diffview plugin

main
Marko Korhonen 4 months ago
parent f9b7a93570
commit 845f4024df
No known key found for this signature in database
GPG Key ID: A7F78BCB859CD890

@ -28,7 +28,7 @@ keepBackup = false
prompt = false
[mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
cmd = nvim +DiffviewOpen
[diff]
tool = nvim
@ -37,7 +37,7 @@ tool = nvim
prompt = false
[difftool "nvim"]
cmd = nvim -d $LOCAL $REMOTE
cmd = nvim +DiffviewOpen
[pull]
rebase = merges

@ -4,5 +4,7 @@ return {
enabled = vim.g.neovide == not nil,
"yutkat/confirm-quit.nvim",
event = "CmdlineEnter",
config = true,
opts = {
quit_message = "You are in Neovide, are you sure you want to quit?",
},
}

@ -0,0 +1,3 @@
-- Improved diffs
--- @type LazyPluginSpec
return { "sindrets/diffview.nvim" }
Loading…
Cancel
Save