Changelog for mergiraf-0.5.1-1.1.x86_64.rpm :

* Sat Feb 08 2025 Martin Hauke - Update to version 0.5.1: Bugfix release
* The --compact option works again, without needing to supply \"--compact=true\".
* Thu Feb 06 2025 Martin Hauke - Update to version 0.5.0: New languages
* PHP
* Solidity
* TSX
* Lua
* Kotlin
* Devicetree
* Ruby Improvements
* The histogram diff algorithm is used for line-based merges.
* The mgf_dev parse command correctly displays nodes that have a signature and are commutative at the same time.
* Don\'t add a newline at the end of merged / to-be-merged files.
* Also parse correctly conflicts with non-newline-terminated sides.
* The --keep-output option was added to the mergiraf solve to control the creation of .orig files.
* The conflict size marker size can be controlled with option -l
* The commutativity of various syntactic elements was restricted to avoid bad merges.
* A --timeout option is available in mergiraf merge, to fall back on line-based merging if structured merging takes too long.
* A panic when failing to commutatively merge a root node was fixed. Compatibility
* Support for the MERGIRAF_DISABLE environment variable was removed, use mergiraf=0 instead. Performance
* Many improvements reducing memory allocations.
* Sun Dec 08 2024 Martin Hauke - Update to version 0.4.0: New languages
* Python
* TOML
* Scala
* Typescript Performance
* Many performance improvements. Bug fixes
* The solve command preserves revision names in conflicts.
* Don\'t swallow trailing whitespace of merged nodes.
* Make helpers runnable from any directory. New features
* Replace MERGIRAF_DISABLE=1 by mergiraf=0
* Support for restricting commutativity.
* Wed Nov 13 2024 mardnhAATTgmx.de- Update to version 0.3.1:
* Updated tree-sitter-xml to 0.7.0
* Tue Nov 12 2024 Martin Hauke - Update to version 0.3.0
* New language: Dart (
*.dart).
* .cc files are correctly detected as C++.
* Documentation improvements.
* Fixes to the integration test suite when GPG signing is enabled
* Sun Nov 10 2024 Martin Hauke - Initial package, version 0.2.0