canteen/mergiraf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
521 commits 2 branches 0 tags 2.4 MiB
  • Rust 98.8%
  • Shell 0.7%
  • Nix 0.5%
Find a file
Exact
Ada Alakbarova da2e47477d
Some checks failed
/ test (push) Has been cancelled
Details
fix(cli): allow passing --allow-parse-errors without an explicit true arg (#713) 
See https://codeberg.org/mergiraf/mergiraf/pulls/712#issuecomment-10573218

Reviewed-on: https://codeberg.org/mergiraf/mergiraf/pulls/713
Reviewed-by: Antonin Delpeuch <wetneb@noreply.codeberg.org>
Co-authored-by: Ada Alakbarova <ada.alakbarova@proton.me>
Co-committed-by: Ada Alakbarova <ada.alakbarova@proton.me>
2026-02-15 13:27:58 +01:00
.cargo tests: Utility to minimize test cases, continued (#527) 2025-09-11 23:47:22 +02:00
.forgejo/workflows ci: warn against uses of dbg! (#704) 2026-02-11 16:32:31 +01:00
doc fix(cli): allow passing --allow-parse-errors without an explicit true arg (#713) 2026-02-15 13:27:58 +01:00
examples fix(TOML): treat quoted_key as atomic, fixing their merging (#668) 2026-01-06 08:22:51 +01:00
helpers fix(cli): allow passing --allow-parse-errors without an explicit true arg (#713) 2026-02-15 13:27:58 +01:00
mgf_dev feat: enable merging with syntax errors (#658) 2026-02-07 16:37:44 +01:00
src fix(cli): allow passing --allow-parse-errors without an explicit true arg (#713) 2026-02-15 13:27:58 +01:00
tests feat: extend attribute support (#703) 2026-02-10 15:33:37 +01: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 tests: Re-run if examples/ directory changed (#381) 2025-05-13 09:15:49 +00:00
Cargo.lock feat: extend attribute support (#703) 2026-02-10 15:33:37 +01:00
Cargo.toml feat: extend attribute support (#703) 2026-02-10 15:33:37 +01:00
cliff.toml chore(changelog): add commit ids to log entries without names (#547) 2025-07-28 21:19:01 +02:00
CONTRIBUTING.md feat: convert the committed .envrc to an example, with contribution instructions (#711) 2026-02-14 09:11:02 +01:00
flake.lock chore: Update to Rust 1.89 (#579) 2025-09-02 11:14:26 +02:00
flake.nix fix(flake): add rust-analyzer to the devshell (#665) 2025-12-30 20:05:56 +01:00
GOVERNANCE.md Add governance document 2024-11-01 20:38:33 +01:00
LICENSE.txt Initial release 2024-11-01 14:06:12 +01:00
members.yml governance: make mathsuf a publisher (#679) 2026-01-28 14:09:44 +01:00
README.md chore: Add CONTRIBUTING.md (#438) 2025-07-03 18:15:25 +02:00
rustfmt.toml chore(rustfmt): create an empty config file (#710) 2026-02-13 22:33:22 +01:00

README.md

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