Diffconflicts: A better Vimdiff Git mergetoolgithub.com2 points·mzehrer··1 commentOpen articleSaveView on HN