mirror of
https://codeberg.org/peterlodri-sec/mergiraf.git
synced 2026-11-21 22:49:57 +01:00
A syntax-aware git merge driver for a growing collection of programming languages and file formats.
- Rust 68.1%
- Java 20.1%
- Python 4.3%
- MATLAB 0.9%
- Shell 0.8%
- Other 5.3%
| Filename | Latest commit message | Latest commit date |
|---|---|---|
Co-authored-by: Ben Boeckel <mathstuf@gmail.com> Reviewed-on: https://codeberg.org/mergiraf/mergiraf/pulls/852 Reviewed-by: Antonin Delpeuch <wetneb@noreply.codeberg.org> |
||
| .cargo | ||
| .forgejo/workflows | ||
| doc | ||
| helpers | ||
| mgf_dev | ||
| src | ||
| tests | ||
| .clippy.toml | ||
| .envrc.example | ||
| .gitattributes | ||
| .gitignore | ||
| .mailmap | ||
| build.rs | ||
| Cargo.lock | ||
| Cargo.toml | ||
| cliff.toml | ||
| CONTRIBUTING.md | ||
| flake.lock | ||
| flake.nix | ||
| GOVERNANCE.md | ||
| LICENSE.txt | ||
| members.yml | ||
| README.md | ||
| rustfmt.toml | ||
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