Mergiraf - syntax-aware git merge driver

mergiraf: a driver for `git merge` that uses an understanding of programming language syntax to resolve merge conflicts

Mergiraf: a syntax-aware merge driver for Git