Super HN - Super Hacker News

Mergiraf: a syntax-aware merge driver for Git (mergiraf.org) 1 point by p4bl0 3 minutes ago