Use vimdiff as git mergetool - Ruslan Osipov

Fri, 20 Jan 2017 00:00:46 PST · http://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/

vim