A 2-pane Neovim plugin for resolving Git merge conflicts.
diplomat.mp4
- The simplest layout possible: 2 side-by-side buffers showing ours vs theirs.
- Seamless navigation: Jump between conflicts instantly, without manual scrolling.
- Edit anything: Edit conflict or non-conflict areas just like any other buffer, undo/redo changes.
- TODO: Line diff.
{
'mturoci/diplomat.nvim',
config = function()
require('diplomat').setup()
end
}use {
'mturoci/diplomat.nvim',
config = function()
require('diplomat').setup()
end
}Plug 'mturoci/diplomat.nvim'require('diplomat').setup({
mappings = {
n = {
['u'] = 'undo',
['<C-r>'] = 'redo',
['[c'] = 'jump_next',
[']c'] = 'jump_prev',
['<leader>b'] = 'accept_both',
['<leader>a'] = 'accept_current',
},
},
highlight = 'DiplomatConflict',
})To disable all default mappings:
require('diplomat').setup({
mappings = {},
}):lua require('diplomat').resolveConflicts()