Syntax-aware merger driver for Git. mergiraf is a syntax-aware git merge driver for a growing collection of programming languages and file formats.

WWW: https://mergiraf.org/
