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%
Find a file
Repository files (latest commit first)
Filename Latest commit message Latest commit date
Ben Boeckel d88acb6233 cargo-update-20261026 (#852)
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>
2026-10-27 23:09:49 +01:00
.cargo tests: Utility to minimize test cases, continued (#527) 2025-09-11 23:47:22 +02:00
.forgejo/workflows chore: Update NodeJS in CI (#834) 2026-09-24 17:24:44 +02:00
doc chore: alternative approach to compiled query caching (#841) 2026-10-18 12:47:12 +02:00
helpers tests: Utilities to benchmark mergiraf on large corpora (#537) 2026-09-26 09:23:06 +02:00
mgf_dev fix(mgf_dev): restore proper logging, add verbosity control (#821) 2026-09-07 21:24:27 +02:00
src chore: use insta in more tests (#838) 2026-10-18 13:44:19 +02:00
tests chore: move QML test suite to new location 2026-10-19 19:57:33 +02:00
.clippy.toml refactor: rename tree.rs to ast.rs (#324) 2025-04-16 09:43:13 +00:00
.envrc.example feat: convert the committed .envrc to an example, with contribution instructions (#711) 2026-02-14 09:11:02 +01:00
.gitattributes git(attributes): set the conflict marker size in all files (#202) 2025-02-12 08:24:36 +00:00
.gitignore feat: convert the committed .envrc to an example, with contribution instructions (#711) 2026-02-14 09:11:02 +01:00
.mailmap git: change name using .mailmap (#253) 2025-03-08 17:48:50 +00:00
build.rs chore: restore build.rs to refresh test binary if test data changed (#822) 2026-09-07 21:25:30 +02:00
Cargo.lock cargo-update-20261026 (#852) 2026-10-27 23:09:49 +01:00
Cargo.toml cargo-update-20261020 (#849) 2026-10-20 08:59:29 +02:00
cliff.toml chore(changelog): add commit ids to log entries without names (#547) 2025-07-28 21:19:01 +02:00
CONTRIBUTING.md test: move integration test cases to tests/data (#808) 2026-08-10 14:39:54 +02:00
flake.lock depin nixpkgs; update input to include newer cargo audit (#779) 2026-06-04 20:29:15 +02:00
flake.nix test: move integration test cases to tests/data (#808) 2026-08-10 14:39:54 +02:00
GOVERNANCE.md fix: typo in Liberapay URL 2026-05-18 17:30:52 +02:00
LICENSE.txt Initial release 2024-11-01 14:06:12 +01:00
members.yml governance: add ipsavitsky to the Developers team (#778) 2026-06-08 10:03:03 +02:00
README.md doc(readme): acknowledge Zulip sponsorship of the public Zulip instance (#783) 2026-06-09 09:11:12 +02:00
rustfmt.toml chore(rustfmt): create an empty config file (#710) 2026-02-13 22:33:22 +01:00

Mergiraf

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

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

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

License: GPLv3