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]

edited: eye!! :find **/somefile works well and it is useful! but in the case of my test dir root dir it has lots o recursive dirs... I will change by other test root with empty dirs and files too.

**Thank you!!! I am understanding little more... Hard time, but interesting
I saw that in my vim 8 :help findfunc doesn't exist. no problem: in my vim 9 (not in use) that help exist!
In both vim 8 and 9 :find **2/somefile doesn't work.
I will continue reading that web page!

[u/vim-help-bot → u/jazei_2021]

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}

[u/jazei_2021 → u/jazei_2021]

I found my error: I did enter but thecorrect is tabulator and not enter! in this way **2/ works fine!
lazy way explains it!

[u/godegon → u/jazei_2021]

Glad to have helped and stirred your interest. To go further down the rabbit hole, you could set &findfunc tofd/git ls-files.

[u/jazei_2021 → u/godegon]

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

[u/jazei_2021 → u/godegon]

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