paperlined.org
apps > git

document updated 12 years ago, on Jan 13, 2012

Tips on integrating vim / vimdiff with Git:

use for 3-way merges

[1]

use for 'git diff'

[1]

doing the same, but for other tools

meld
- git diff — [1]

.vimrc / etc modifications

Real plugins:

Smaller stuff:

~Tim Pope