Comment Comment by jaycox2931 https://github.com/akinsho/git-conflict.nvim if you're into neovim parent jaycox2931 3 years ago
