1.1. Vim Git And Diff - shinokada/gitnotes GitHub Wiki

.orig file

Diff tool generate unwanted .orig files

Resources

Git and Vimdiff

Use vimdiff as git mergetool

Fugitive.vim - resolving merge conflicts with vimdiff

vim-fugitive

Important: The Tables of Content are generated. Any change will be overridden on the next update.
For more information: GitHub Wikifier

⚠️ **GitHub.com Fallback** ⚠️