For any neovim users, https://vimawesome.com/plugin/fugitive-vim https://vimawesome.com/plugin/fugitive-vim absolutely nails three way diffing. I honestly enjoy

For any neovim users, https://vimawesome.com/plugin/fugitive-vim https://vimawesome.com/plugin/fugitive-vim absolutely nails three way diffing. I honestly enjoy running a :Gvdiff these days.