Better Git Conflicts with Zdiff3 | Hacker News Reader