mergiraf - A syntax-aware git merge driver for a growing collection of programming languages and file formats.

Interesting: A merge driver which tries to do its best to really only leave conflicts over,
using its knowledge of various syntax trees of languages.