Three-way merging for git using vim(toofishes.net)1 points·by jessor·16 anni fa·0 commentstoofishes.netThree-way merging for git using vimhttp://www.toofishes.net/blog/three-way-merging-git-using-vim/0 commentsPost comment—