Mergiraf A syntax-aware git merge driver for a growing collection of programming languages and file formats. See the documentation. License: GPLv3