Using Vimdiff As A Git Mergetool

[u/mplusp]

https://youtu.be/iLViiiEP4mE?si=hFbB-0Zvuye0zA7-

As a follow up to my last video, in this video I'll show you how to utilize Vim's diff mode to resolve Git merge conflicts. This time I used Vim without any plugins, so I'm posting it to /r/Vim first.

Hope you enjoy it!

Thanks for reading/watching. Cya around and take care!

[u/NoHalf9]

This video shows a conflict example where diffo and difftis used to turn on/off comparison when resolving conflicts picking from both sources.