Hacker News new | ask | show | jobs
by jaycox2931 1072 days ago
https://github.com/akinsho/git-conflict.nvim if you're into neovim