O'Reilly logo

Mastering Vim by Ruslan Osipov

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

git config

First and foremost, configure Git to use vimdiff as a merge tool:

$ git config --global merge.tool vimdiff$ git config --global merge.conflictstyle diff3$ git config --global mergetool.prompt false

This will set Git as the default merge tool, will display a common ancestor while merging, and will disable the prompt asking you to open vimdiff.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required