2022-10-01 11:46:18 +00:00
|
|
|
local status_ok, diffview = pcall(require, "diffview")
|
|
|
|
|
if not status_ok then
|
|
|
|
|
return
|
|
|
|
|
end
|
|
|
|
|
|
2022-11-16 16:39:39 +00:00
|
|
|
diffview.setup({
|
|
|
|
|
view = {
|
|
|
|
|
merge_tool = {
|
|
|
|
|
layout = "diff3_mixed",
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
})
|
2022-10-01 11:46:18 +00:00
|
|
|
|
|
|
|
|
vim.opt.fillchars = "diff: "
|
