diffthis.nvim
diffthis.nvim copied to clipboard
Use neovim as a diffing tool
DiffThis.nvim
Use neovim as a diffing tool
Requirements
- neovim
- git
Installation
lazy.nvim:
{
"Bleksak/diffthis.nvim",
opts = {
keys = {
toggle = "<leader>dd",
obtain = "do",
put = "dp",
next = "dn",
prev = "dN",
}
}
}
Usage
Use your toggle key binding to toggle the diff window, then you can use the key bindings you have set to resolve merge conflicts. Toggling back will save the left buffer as the original file. If there are any unresolved conflicts, diff markers will be created for them using git merge-file.
Contributing
Feel free to open a pull request if you find any issues or want to improve this plugin in any way.