3 ms·
https://github.com/akinsho/git-conflict.nvim https://github.com/akinsho/git-conflict.nvim if you're into neovim
by jaycox2931 3y ago
https://github.com/akinsho/git-conflict.nvim https://github.com/akinsho/git-conflict.nvim if you're into neovim