Mergiraf

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

• Documentation
• Zulip chat (public accessibility sponsored by Zulip)

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

If you want to support our work, thank you! See Liberapay.

License: GPLv3