return { { "sindrets/diffview.nvim", keys = { { "gd", "DiffviewFileHistory", desc = "Diff File History" }, }, opts = {}, }, { "akinsho/git-conflict.nvim", opts = { default_mappings = false, highlights = { incoming = "DiffAdd", current = "DiffText", }, }, keys = { { "gct", "GitConflictChooseTheirs", desc = "Choose Their Changes" }, { "gco", "GitConflictChooseOurs", desc = "Choose Our Changes" }, { "gcb", "GitConflictChooseBoth", desc = "Choose Both changes" }, { "gcl", "GitConflictListQf", desc = "Git Conflict Quicklist" }, { "[g", "GitConflictPrevConflict", desc = "Prev Git Conflict" }, { "]g", "GitConflictPrevConflict", desc = "Next Git Conflict" }, }, }, }