mergiraf-0.5.1-1.1 RPM for x86_64

From OpenSuSE Tumbleweed for x86_64

Mergiraf can solve a wide range of Git merge conflicts.
That's because it's aware of the trees in your files!

Thanks to its understanding of your language, it can often
reconcile the needs of both sides.

Provides

• mergiraf
• bundled(rust-crate:adler2)
• bundled(rust-crate:aho-corasick)
• bundled(rust-crate:anstream)
• bundled(rust-crate:anstyle)
• bundled(rust-crate:anstyle-parse)
• bundled(rust-crate:anstyle-query)
• bundled(rust-crate:arrayvec)
• bundled(rust-crate:autocfg)
• bundled(rust-crate:bumpalo)
• bundled(rust-crate:byteorder)
• bundled(rust-crate:cc)
• bundled(rust-crate:cfg-if)
• bundled(rust-crate:chrono)
• bundled(rust-crate:clap)
• bundled(rust-crate:clap_builder)
• bundled(rust-crate:clap_derive)
• bundled(rust-crate:clap_lex)
• bundled(rust-crate:colorchoice)
• bundled(rust-crate:crc32fast)
• bundled(rust-crate:derive_more)
• bundled(rust-crate:diffy-imara)
• bundled(rust-crate:displaydoc)
• bundled(rust-crate:either)
• bundled(rust-crate:equivalent)
• bundled(rust-crate:etcetera)
• bundled(rust-crate:fixedbitset)
• bundled(rust-crate:flate2)
• bundled(rust-crate:foldhash)
• bundled(rust-crate:getrandom)
• bundled(rust-crate:hashbrown)
• bundled(rust-crate:hashbrown)
• bundled(rust-crate:heck)
• bundled(rust-crate:home)
• bundled(rust-crate:iana-time-zone)
• bundled(rust-crate:imara-diff)
• bundled(rust-crate:indexmap)
• bundled(rust-crate:indexmap)
• bundled(rust-crate:integer-sqrt)
• bundled(rust-crate:is-terminal)
• bundled(rust-crate:is_terminal_polyfill)
• bundled(rust-crate:itertools)
• bundled(rust-crate:itertools)
• bundled(rust-crate:libc)
• bundled(rust-crate:lockfree-object-pool)
• bundled(rust-crate:log)
• bundled(rust-crate:memchr)
• bundled(rust-crate:mergiraf)
• bundled(rust-crate:miniz_oxide)
• bundled(rust-crate:nu-ansi-term)
• bundled(rust-crate:num-traits)
• bundled(rust-crate:once_cell)
• bundled(rust-crate:oneshot)
• bundled(rust-crate:pathfinding)
• bundled(rust-crate:ppv-lite86)
• bundled(rust-crate:proc-macro2)
• bundled(rust-crate:quote)
• bundled(rust-crate:rand)
• bundled(rust-crate:rand_chacha)
• bundled(rust-crate:rand_core)
• bundled(rust-crate:regex)
• bundled(rust-crate:regex-automata)
• bundled(rust-crate:regex-syntax)
• bundled(rust-crate:rustc-hash)
• bundled(rust-crate:rustc-hash)
• bundled(rust-crate:shlex)
• bundled(rust-crate:simd-adler32)
• bundled(rust-crate:stderrlog)
• bundled(rust-crate:streaming-iterator)
• bundled(rust-crate:strsim)
• bundled(rust-crate:syn)
• bundled(rust-crate:termcolor)
• bundled(rust-crate:thiserror)
• bundled(rust-crate:thiserror)
• bundled(rust-crate:thiserror-impl)
• bundled(rust-crate:thiserror-impl)
• bundled(rust-crate:thread_local)
• bundled(rust-crate:tree-edit-distance)
• bundled(rust-crate:tree-sitter)
• bundled(rust-crate:tree-sitter-c-sharp)
• bundled(rust-crate:tree-sitter-cpp)
• bundled(rust-crate:tree-sitter-dart)
• bundled(rust-crate:tree-sitter-devicetree)
• bundled(rust-crate:tree-sitter-go)
• bundled(rust-crate:tree-sitter-html)
• bundled(rust-crate:tree-sitter-java)
• bundled(rust-crate:tree-sitter-javascript)
• bundled(rust-crate:tree-sitter-json)
• bundled(rust-crate:tree-sitter-kotlin-ng)
• bundled(rust-crate:tree-sitter-language)
• bundled(rust-crate:tree-sitter-lua)
• bundled(rust-crate:tree-sitter-php)
• bundled(rust-crate:tree-sitter-python)
• bundled(rust-crate:tree-sitter-ruby)
• bundled(rust-crate:tree-sitter-rust)
• bundled(rust-crate:tree-sitter-scala)
• bundled(rust-crate:tree-sitter-solidity)
• bundled(rust-crate:tree-sitter-toml-ng)
• bundled(rust-crate:tree-sitter-typescript)
• bundled(rust-crate:tree-sitter-xml)
• bundled(rust-crate:tree-sitter-yaml)
• bundled(rust-crate:typed-arena)
• bundled(rust-crate:unicode-ident)
• bundled(rust-crate:utf8parse)
• bundled(rust-crate:zerocopy)
• bundled(rust-crate:zerocopy-derive)
• bundled(rust-crate:zip)
• bundled(rust-crate:zopfli)
• mergiraf(x86-64)

Requires

• libc.so.6()(64bit)
• libc.so.6(GLIBC_2.14)(64bit)
• libc.so.6(GLIBC_2.15)(64bit)
• libc.so.6(GLIBC_2.16)(64bit)
• libc.so.6(GLIBC_2.17)(64bit)
• libc.so.6(GLIBC_2.18)(64bit)
• libc.so.6(GLIBC_2.2.5)(64bit)
• libc.so.6(GLIBC_2.25)(64bit)
• libc.so.6(GLIBC_2.28)(64bit)
• libc.so.6(GLIBC_2.29)(64bit)
• libc.so.6(GLIBC_2.3)(64bit)
• libc.so.6(GLIBC_2.3.2)(64bit)
• libc.so.6(GLIBC_2.3.4)(64bit)
• libc.so.6(GLIBC_2.32)(64bit)
• libc.so.6(GLIBC_2.33)(64bit)
• libc.so.6(GLIBC_2.34)(64bit)
• libc.so.6(GLIBC_2.39)(64bit)
• libc.so.6(GLIBC_2.4)(64bit)
• libc.so.6(GLIBC_2.9)(64bit)
• libgcc_s.so.1()(64bit)
• libgcc_s.so.1(GCC_3.0)(64bit)
• libgcc_s.so.1(GCC_3.3)(64bit)
• libgcc_s.so.1(GCC_4.2.0)(64bit)
• libm.so.6()(64bit)
• libm.so.6(GLIBC_2.29)(64bit)
• rpmlib(CompressedFileNames) <= 3.0.4-1
• rpmlib(FileDigests) <= 4.6.0-1
• rpmlib(PayloadFilesHavePrefix) <= 4.0-1
• rpmlib(PayloadIsZstd) <= 5.4.18-1

License

GPL-3.0-or-later

Changelog

* Sat Feb 08 2025 Martin Hauke <mardnh@gmx.de>
  - 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 <mardnh@gmx.de>
  - 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 <mardnh@gmx.de>
  - 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 mardnh@gmx.de
  - Update to version 0.3.1:
    * Updated tree-sitter-xml to 0.7.0
* Tue Nov 12 2024 Martin Hauke <mardnh@gmx.de>
  - 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 <mardnh@gmx.de>
  - Initial package, version 0.2.0

Files

/usr/bin/mergiraf
/usr/bin/mgf_dev
/usr/share/doc/packages/mergiraf
/usr/share/doc/packages/mergiraf/README.md
/usr/share/licenses/mergiraf
/usr/share/licenses/mergiraf/LICENSE.txt

Generated by rpm2html 1.8.1

Fabrice Bellet, Wed Feb 26 00:06:21 2025