Vim Techniques 17 - vimdiff (part 2)
Part 2 (last part) covers working with more than 2 files in vimdiff, and finally how to setting up git 3-way mergetool with vimdiff.
--- Resource --
Git repository that has ready conflict if merge: https://github.com/haxpor/mergeconfli...
My writeup on this same topic (included perforce): https://wasin.io/blog/29_how-to-set-u...
git mergetool - documentation: https://git-scm.com/docs/git-mergetool
-- Chapters --
0:00 Introduction
1:00 vimdiff with more than 2 files
5:45 :wincmd to aid in window arrangement
6:40 Recap of merge conflict, and why 3-way merge
10:33 Setting up git 3-way mergetool
21:00 Test what we've setup
27:10 Closing
#vim #vimtechniques
-- Follows Wasin on socials --
Website: https://wasin.io
Twitter: @haxpor
LinkedIn: / wasinthonkaew
Github: https://github.com/haxpor