Commit b8999ae
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 ([#​599](https://github.com/mergiraf/mergiraf/issues/599)) by [@​mathstuf](https://github.com/mathstuf)
- *(rust)* Add `derive` attribute as commutative parent ([#​614](https://github.com/mergiraf/mergiraf/issues/614)) by [@​vaw](https://github.com/vaw)
- Use tree-sitter-c to parse `.c` files ([#​634](https://github.com/mergiraf/mergiraf/issues/634)) by [@​data-man](https://github.com/data-man)
##### 🐛 Bug Fixes
- *(toml)* Invalid signature for keys ([#​607](https://github.com/mergiraf/mergiraf/issues/607)) by [@​wetneb](https://github.com/wetneb)
- Preserve CRLF newlines in `solve` and `merge` commands ([#​608](https://github.com/mergiraf/mergiraf/issues/608)) by [@​wetneb](https://github.com/wetneb)
- *(merge)* Don't fail if the revisions contain stray conflict markers ([#​615](https://github.com/mergiraf/mergiraf/issues/615)) by [@​wetneb](https://github.com/wetneb)
- *(merge)* Don't panic on non-UTF-8 content ([#​620](https://github.com/mergiraf/mergiraf/issues/620)) by [@​wetneb](https://github.com/wetneb)
- Stack overflow when forcing line-based merges ([#​623](https://github.com/mergiraf/mergiraf/issues/623)) by [@​wetneb](https://github.com/wetneb)
- *(Rust)* Restrict commutativity of `derive` attributes ([#​626](https://github.com/mergiraf/mergiraf/issues/626)) by [@​wetneb](https://github.com/wetneb)
##### 📚 Documentation
- Further improvements to the tutorial to add a language ([#​597](https://github.com/mergiraf/mergiraf/issues/597)) by [@​wetneb](https://github.com/wetneb)
##### ⚡ Performance
- Reduce the number of calls to git-check-attr ([#​602](https://github.com/mergiraf/mergiraf/issues/602)) by [@​wetneb](https://github.com/wetneb)
##### 🧪 Testing
- Allow passing contents to `create_file{s,}_for_{merge,solve}` ([#​632](https://github.com/mergiraf/mergiraf/issues/632)) by [@​ada4a](https://github.com/ada4a)
##### ⚙️ Miscellaneous Tasks
- *(lang\_profile)* Rm leftover function ([#​604](https://github.com/mergiraf/mergiraf/issues/604)) by [@​ada4a](https://github.com/ada4a)
- Better error types for TreeBuilder ([#​563](https://github.com/mergiraf/mergiraf/issues/563)) by [@​wetneb](https://github.com/wetneb)
- Update dependencies ([#​628](https://github.com/mergiraf/mergiraf/issues/628)) by [@​wetneb](https://github.com/wetneb)
- Generate release artifacts ([#​635](https://github.com/mergiraf/mergiraf/issues/635)) by [@​wetneb](https://github.com/wetneb)
- Update action to upload releases ([#​640](https://github.com/mergiraf/mergiraf/issues/640)) by [@​wetneb](https://github.com/wetneb)
##### 🎉 New contributors
- [@​data-man](https://github.com/data-man) made their first contribution in [#​634](https://github.com/mergiraf/mergiraf/issues/634)
- [@​vaw](https://github.com/vaw) made their first contribution in [#​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
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
0 commit comments