v0.6.9.trocco.0.1.0

What's Changed

• Merge origin by @t3t5u in #30
• Added merge mode by @t3t5u in #31
• ship 0.6.9.trocco.0.1.0 by @d-hrs in #32

New Contributors

• @t3t5u made their first contribution in #30
• @d-hrs made their first contribution in #32

Full Changelog: v0.6.9.trocco.0.0.3...v0.6.9.trocco.0.1.0