Three way merge with Vim


(Manish R Jain) #1

An amazing screencast which makes 3-way merging much easier.

http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vimdiff/