toofishes.net - Three-way merging for git using vim

www.toofishes.net/blog/three-way-merging-git-using-vim

Saved 20 times on del.icio.us, most recently in 2012.

Tags: git vim merge vimdiff blog diff versioncontrol to-read

More links tagged git

More links tagged vim

More links tagged merge