toofishes.net - Three-way merging for git using vimThree-way merging for git using vim Posted Sept. 14, 2010 at 8:59 p.m. There was an interesting post regarding painless merge conflict resolution in git that popped up on programming reddit today, and it got me thinking- there has to be a way to get true three-way merge working in vim. It turns out there is, you just have to do some finagling to do so. By default, the git mergetool logic for vim a
