A syntax-aware git merge driver for a growing collection of programming languages and file formats. https://mergiraf.org/

  • Rust 69%
  • Java 20.3%
  • Python 3.6%
  • MATLAB 0.9%
  • Scheme 0.6%
  • Other 5.1%
Repository files (latest commit first)
Filename Latest commit message Latest commit date

610872d8b6

/ test (push) Successful in 2m18s

fix: name the file in the structured merge timeout warning ( #828 )

When the structured merge times out, the warning now includes the path
of the file that fell back to Git (from `-p`, or the base path otherwise):

    WARN structured merge of src/app/models.py took too long, falling back to Git

This is the minimal version discussed in #466.

The pre-timeout progress line from the original request is left out for now,
as it would mostly repeat this warning a few seconds earlier.

Reviewed-on: #828
Reviewed-by: Ada Alakbarova <ada4a@noreply.codeberg.org>

2026-09-13 16:31:20 +02:00
.cargo tests: Utility to minimize test cases, continued ( #527 ) 2025-09-11 23:47:22 +02:00
.forgejo /workflows ci: check for outdated dependencies less frequently ( #794 ) 2026-07-12 22:33:43 +02:00
doc feat: Add matlab support ( #735 ) 2026-08-16 17:56:31 +02:00
helpers test: move integration test cases to tests/data ( #808 ) 2026-08-10 14:39:54 +02:00
mgf_dev fix(mgf_dev): restore proper logging, add verbosity control ( #821 ) 2026-09-07 21:24:27 +02:00
src fix: name the file in the structured merge timeout warning ( #828 ) 2026-09-13 16:31:20 +02:00
tests fix: name the file in the structured merge timeout warning ( #828 ) 2026-09-13 16:31:20 +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-20260908 ( #827 ) 2026-09-08 21:46:37 +02:00
Cargo.toml cargo-update-20260908 ( #827 ) 2026-09-08 21:46:37 +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

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