BSD Ports

devel/mergiraf 0.20.0 OpenBSD

syntax-aware git merge driver

System
OpenBSD
Repository
OpenBSD ports
Maintainer
Theo Buehler <[email protected]>
Last update
Commit
9e3092b204
Categories
devel, lang/rust

Description

Mergiraf can solve a wide range of Git merge conflicts because it's aware of the syntax trees in your files. Thanks to its understanding of your language, it can often reconcile the needs of both sides.

In the other systems

The newest version among them is 0.20.0, as upstream numbers it.

SystemPortVersionVulnerabilitiesStatusMaintainerLast update
OpenBSDdevel/mergiraf0.20.0 newestno data-Theo Buehler <[email protected]>2026-10-07
NetBSDdevel/mergiraf0.19.0 behind since 2026-09-01none known-[email protected]2026-08-17

Compare across BSDs

Version history 4

  1. 0.20.0 9e3092b204
  2. 0.19.1 9df2d14952
  3. 0.19.0 4c83c75b9f
  4. 0.18.0 939fcd9586

Upstream's version as each commit to the port's Makefile set it, or as this site first saw it in the system's packages; the tree's own revisions are not versions here.

Install

Binary package:

pkg_add mergiraf

From the ports tree:

cd /usr/ports/devel/mergiraf && make install

Dependency graph

Ports that need it on the left, what it needs to run on the right (to build, as it needs nothing to run); at most 8 of each. "Dependencies" below lists them all.

Dependencies

Build dependencies 2

No port depends on this one.

Commit history 5

DateCommitCreditsLog message
9e3092b204 tb Update to mergiraf 0.20.0
https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.20.0
3fec1e3240 kmos mergiraf is no longer BROKEN on sparc64 in the base-clang era
9df2d14952 tb Update to mergiraf 0.19.1
https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.19.1
4c83c75b9f tb Update to mergiraf 0.19
https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.19.0
939fcd9586 tb Update to mergiraf 0.18.0
https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.18.0