mergiraf 0.16.3

A syntax-aware merge driver for Git
Documentation

Mergiraf

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

See the documentation.

We welcome contributions and new team members, see CONTRIBUTING.md.

License: GPLv3