Hacker Next
Mergiraf: a syntax-aware merge driver for Gitmergiraf.org
429 points by p4bl0 6 days ago | 87 comments