Skip to content

Commit b8999ae

Browse files
ECG Bottmeijn
authored andcommitted
build(deps): update cargo:mergiraf to 0.16.0
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [cargo:mergiraf](https://mergiraf.org/) ([source](https://codeberg.org/mergiraf/mergiraf)) | minor | `0.15.0` -> `0.16.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>mergiraf/mergiraf (cargo:mergiraf)</summary> ### [`v0.16.1`](https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.16.1): Mergiraf 0.16.1 [Compare Source](https://codeberg.org/mergiraf/mergiraf/compare/v0.15.0...v0.16.1) ##### 🚀 Features - *(Git)* Support reading language from git attributes ([#&#8203;599](https://github.com/mergiraf/mergiraf/issues/599)) by [@&#8203;mathstuf](https://github.com/mathstuf) - *(rust)* Add `derive` attribute as commutative parent ([#&#8203;614](https://github.com/mergiraf/mergiraf/issues/614)) by [@&#8203;vaw](https://github.com/vaw) - Use tree-sitter-c to parse `.c` files ([#&#8203;634](https://github.com/mergiraf/mergiraf/issues/634)) by [@&#8203;data-man](https://github.com/data-man) ##### 🐛 Bug Fixes - *(toml)* Invalid signature for keys ([#&#8203;607](https://github.com/mergiraf/mergiraf/issues/607)) by [@&#8203;wetneb](https://github.com/wetneb) - Preserve CRLF newlines in `solve` and `merge` commands ([#&#8203;608](https://github.com/mergiraf/mergiraf/issues/608)) by [@&#8203;wetneb](https://github.com/wetneb) - *(merge)* Don't fail if the revisions contain stray conflict markers ([#&#8203;615](https://github.com/mergiraf/mergiraf/issues/615)) by [@&#8203;wetneb](https://github.com/wetneb) - *(merge)* Don't panic on non-UTF-8 content ([#&#8203;620](https://github.com/mergiraf/mergiraf/issues/620)) by [@&#8203;wetneb](https://github.com/wetneb) - Stack overflow when forcing line-based merges ([#&#8203;623](https://github.com/mergiraf/mergiraf/issues/623)) by [@&#8203;wetneb](https://github.com/wetneb) - *(Rust)* Restrict commutativity of `derive` attributes ([#&#8203;626](https://github.com/mergiraf/mergiraf/issues/626)) by [@&#8203;wetneb](https://github.com/wetneb) ##### 📚 Documentation - Further improvements to the tutorial to add a language ([#&#8203;597](https://github.com/mergiraf/mergiraf/issues/597)) by [@&#8203;wetneb](https://github.com/wetneb) ##### ⚡ Performance - Reduce the number of calls to git-check-attr ([#&#8203;602](https://github.com/mergiraf/mergiraf/issues/602)) by [@&#8203;wetneb](https://github.com/wetneb) ##### 🧪 Testing - Allow passing contents to `create_file{s,}_for_{merge,solve}` ([#&#8203;632](https://github.com/mergiraf/mergiraf/issues/632)) by [@&#8203;ada4a](https://github.com/ada4a) ##### ⚙️ Miscellaneous Tasks - *(lang\_profile)* Rm leftover function ([#&#8203;604](https://github.com/mergiraf/mergiraf/issues/604)) by [@&#8203;ada4a](https://github.com/ada4a) - Better error types for TreeBuilder ([#&#8203;563](https://github.com/mergiraf/mergiraf/issues/563)) by [@&#8203;wetneb](https://github.com/wetneb) - Update dependencies ([#&#8203;628](https://github.com/mergiraf/mergiraf/issues/628)) by [@&#8203;wetneb](https://github.com/wetneb) - Generate release artifacts ([#&#8203;635](https://github.com/mergiraf/mergiraf/issues/635)) by [@&#8203;wetneb](https://github.com/wetneb) - Update action to upload releases ([#&#8203;640](https://github.com/mergiraf/mergiraf/issues/640)) by [@&#8203;wetneb](https://github.com/wetneb) ##### 🎉 New contributors - [@&#8203;data-man](https://github.com/data-man) made their first contribution in [#&#8203;634](https://github.com/mergiraf/mergiraf/issues/634) - [@&#8203;vaw](https://github.com/vaw) made their first contribution in [#&#8203;614](https://github.com/mergiraf/mergiraf/issues/614) #### Download Consider installing Mergiraf [via a package manager](https://repology.org/project/mergiraf/versions) to benefit from automatic updates. Otherwise, binaries are available for your convenience below. Binaries for MacOS can be obtained [from Homebrew](https://formulae.brew.sh/formula/mergiraf). </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xNzMuMCIsInVwZGF0ZWRJblZlciI6IjQxLjE3My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
1 parent 867f686 commit b8999ae

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

chezmoi/dot_config/mise/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pipx = "latest"
3838
"cargo:ag" = "0.19.5"
3939
"cargo:gitnr" = "0.2.2"
4040
"cargo:lstr" = "0.2.1"
41-
"cargo:mergiraf" = "0.15.0"
41+
"cargo:mergiraf" = "0.16.0"
4242
"cargo:onefetch" = "2.25.0"
4343
"cargo:rbw" = "1.14.1"
4444
"cargo:so" = "0.4.10"

0 commit comments

Comments
 (0)