Diffconflicts: A better Vimdiff Git mergetool | Hacker News Reader