Mergiraf: a syntax-aware merge driver for Git (via antonin.delpeuch.eu).

I couldn’t find any open source merge driver that would do syntax-aware merging for common programming languages, and be reliable enough for daily use. (…) So I made one.