maralorn/mergiraf
1
0
Fork 0
forked from mergiraf/mergiraf
Code Pull requests Activity
A syntax-aware git merge driver for a growing collection of programming languages and file formats.
332 commits 2 branches 14 tags 2 MiB
Find a file
Francesco Noacco 55e975fb61 feat: Elixir support (#427) 
Reviewed-on: mergiraf/mergiraf#427
Reviewed-by: Antonin Delpeuch <wetneb@noreply.codeberg.org>
Co-authored-by: Francesco Noacco <francesco.noacco2000@gmail.com>
Co-committed-by: Francesco Noacco <francesco.noacco2000@gmail.com>
2025-06-04 15:08:42 +02:00
.forgejo/workflows ci: implement various tips from a blog post (#178) 2025-01-29 10:45:34 +00:00
doc feat: Elixir support (#427) 2025-06-04 15:08:42 +02:00
examples feat: Elixir support (#427) 2025-06-04 15:08:42 +02:00
helpers fix: helpers/inspect.sh (#401) 2025-05-19 09:42:22 +02:00
src feat: Elixir support (#427) 2025-06-04 15:08:42 +02:00
tests fix: Preserve initial whitespace before the first child (#408) 2025-05-26 23:06:41 +02:00
.clippy.toml refactor: rename tree.rs to ast.rs (#324) 2025-04-16 09:43:13 +00:00
.envrc feat: Add Nix flake (#16) 2024-11-12 10:06:49 +00:00
.gitattributes git(attributes): set the conflict marker size in all files (#202) 2025-02-12 08:24:36 +00:00
.gitignore accomodate cargo-flamegraph (#257) 2025-03-13 08:03:30 +00: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: Elixir support (#427) 2025-06-04 15:08:42 +02:00
Cargo.toml feat: Elixir support (#427) 2025-06-04 15:08:42 +02:00
flake.lock chore: update to Rust v1.85.0 and 2024 edition (#273) 2025-03-21 09:39:42 +00:00
flake.nix flake: add mdbook (#243) 2025-03-06 21:57:06 +00: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: Add senekor to the Developers team (#332) 2025-04-28 16:26:13 +00:00
README.md README: correct typo 2024-11-01 15:06:54 +00:00

README.md

Mergiraf

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

See the documentation.

License: GPLv3