Three-way merging for git using vimhttp://www.toofishes.net/blog/three-way-merging-git-using-vim/ by jessor • 16 years ago 1 0 16 years agoTOtoofishes.net