New languages

• Java Properties (.properties) (#274 by @wetneb)

UX improvements

• file formats can be selected manually using the new --language option (#327 by @mathstuf and @wetneb )
• zdiff3-style conflicts are detected and warned against, as Mergiraf doesn't support solving those (#330 by @ada4a)
• using mergiraf solve together with jj gives a helpful error message (#318 by @senekor)
• the --keep option of mergiraf solve was renamed to --stdout (#290 by @ada4a)

Bug fixes

• Incorrect resolution of delete-delete conflict (#312 by @wetneb )
• Spurious indentation changes on untouched nodes (#306 by @wetneb )
• Missing file extensions for C++ (#295 by @mathstuf)
• Unidentified conflict between --keep-backup and --stdout (#291 by @ada4a )
• The --debug option was advertised in commands where it doesn't have any effect (#289 by @ada4a )
• Java: Missing commutativity for 'throws' declarations (#278 by @wetneb)
• Java: Missing commutativity in interfaces (#250 by @wetneb )
• Python: Missing commutativity for "import from" statements (#248 by @wetneb )

Performance

Many optimizations by @ada4a (#329, #328, #285, #266, #267)

Documentation

• advise to use diff3 conflict style (#331 by @ada4a )
• explain how to use Mergiraf with Jujutsu (#317 by @senekor)

Governance changes

We welcomed @senekor (#332) and @bobvanderlinden (#239) in the Developers team.

Packaging changes

We no longer publish binaries for Apple platforms and recommend users to get them from Homebrew instead.

New languages

• SystemVerilog (*.sv, *.svh), by @come_744 (#226)
• Nix (*.nix), by @funkeleinhorn (#183)

New features

• feat(LangProfile::detect_from_filename): handle extension comparison more correctly, by @ada4a (#220)
• feat(MergedTree::line_based_local_fallback_for_revnode): handle the case of isomorphic left and right sides, by @ada4a (#203)
• feat(line_based_merge_with_duplicate_signature_detection): if the line-merge has conflicts, reconstruct and check each revision, by @ada4a (#195)
• feat: Add command to compare files by tree isomorphism by @wetneb (#200)

Fixes

• fix(cli): add . to extensions in languages output, by @bobvanderlinden (#238)
• fix(cli): add actual docs to --conflict-marker-size option, by @ada4a (#228)
• fix(MergedTree/count_conflicts): respect conflict marker size, by @ada4a (#217)
• fix(highlight_duplicate_signatures): don't remove separators if no conflict was built, by @ada4a (#211)
• fix(TreeBuilder): resolve not-really-conflicts (left and right agree), by @ada4a (#204)

Performance improvements

• perf: use rustc-hash in more places, by @ada4a (#215)

Bug fixes

• The --compact option works again, without needing to supply --compact=true, by @ada4a (#193)

New languages

• PHP, by @zanbaldwin (#104)
• Solidity, by @karlb (#138)
• TSX, by @zivarah (#140)
• Lua, by @zivarah (#146)
• Kotlin, by @wetneb (#56)
• Devicetree, by @funkeleinhorn (#175)
• Ruby, by @wetneb (#182)

Improvements

• The histogram diff algorithm is used for line-based merges, by @ada4a (#100)
• The mgf_dev parse command correctly displays nodes that have a signature and are commutative at the same time, by @mianm (#126)
• Don't add a newline at the end of merged / to-be-merged files, by @ada4a (#143)
• Also parse correctly conflicts with non-newline-terminated sides, by @ada4a (#185)
• The --keep-output option was added to the mergiraf solve to control the creation of .orig files, by @ada4a (#156)
• The conflict size marker size can be controlled with option -l, by @ada4a (#136)
• The commutativity of various syntactic elements was restricted to avoid bad merges, by @wetneb (#86)
• A --timeout option is available in mergiraf merge, to fall back on line-based merging if structured merging takes too long, by @ada4a and @wetneb (#141)
• A panic when failing to commutatively merge a root node was fixed, by @wetneb (#174)

Compatibility

• Support for the MERGIRAF_DISABLE environment variable was removed, use mergiraf=0 instead, by @ada4a (#190)

Performance

• Many improvements reducing memory allocations, by @ada4a (#91, #94, #93, #98, #148 and more)

Governance

• @ada4a became a Publisher
• @zivarah became a Developer
• @funkeleinhorn became a Developer

New in this release:

New languages

• Python (#44) by @rvalyi
• TOML (#48) by @Funkeleinhorn
• Scala (#32) by @keirlawson
• Typescript (#45) by @bobvanderlinden

Performance

Many performance improvements by @Noratrieb (#39, #40) and @ugur-a (#62, #65, #80, #86)

Bug fixes

• The solve command preserves revision names in conflicts (#74) by @wetneb
• Don't swallow trailing whitespace of merged nodes (#59) by @wetneb
• Make helpers runnable from any directory (#31) by @wetneb

New features

• Replace MERGIRAF_DISABLE=1 by mergiraf=0 (#55) by @ugur-a
• Support for restricting commutativity (#33) by @wetneb

Documentation

• Add installation instructions using the Mergiraf crate (#29) by @Siilwyn

Governance

• @ugur-a became a Developer
• New contributors: @rvalyi, @Funkeleinhorn, @bobvanderlinden, @Noratrieb, @ugur-a, @keirlawson, @Siilwyn

New in this release:

• Updated tree-sitter-xml to 0.7.0
• Published mergiraf on crates.io (#12), suggested by @shchvova

New in Mergiraf 0.3.0:

• New language: Dart (*.dart), by @dbravender
• Nix flake, by @ugur-a and @lafrenierejm
• .cc files are correctly detected as C++, by @jez
• Documentation improvements by @early and @wetneb
• Fixes to the integration test suite when GPG signing is enabled, by @raffomania

Thank you all!

New in Mergiraf 0.2.0:

• the mergiraf solve is now able to fetch the three revisions from git's index if solving the conflicts in fast mode fails (#2). As a result, the command works even if conflicts are presented in the diff2 style (previously, diff3 was required),
• various documentation improvements,
• binaries for more architectures.

Initial release.