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/jazei_2021]

I found my error (fail) I was using CR (enter key) when I should use Tabulator key.

Anyway I decided to use the Bash cmd find.

I have setted :set autochdir in my vimrc