Three-way merging for git using vim | Hacker News Reader