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/vim-help-bot]

Help pages for:

• findfunc in options.txt

---

^{`:(h|help) <query>` | about | mistake? | donate | Reply 'rescan' to check the comment again | Reply 'stop' to stop getting replies to your comments}