mirror of
https://github.com/dcarrillo/dotfiles.git
synced 2024-09-16 11:52:38 +00:00
15 lines
203 B
Lua
15 lines
203 B
Lua
local status_ok, diffview = pcall(require, "diffview")
|
|
if not status_ok then
|
|
return
|
|
end
|
|
|
|
diffview.setup({
|
|
view = {
|
|
merge_tool = {
|
|
layout = "diff3_mixed",
|
|
},
|
|
},
|
|
})
|
|
|
|
vim.opt.fillchars = "diff: "
|