The devel/mergiraf port
mergiraf-0.16.1 – syntax-aware git merge driver (cvsweb github mirror)
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.WWW: https://mergiraf.org/
Maintainer
Theo Buehler
Only for arches
aarch64 alpha amd64 arm hppa i386 mips64 mips64el powerpc powerpc64 riscv64 sparc64
Broken
on sparc64: treesitter-yaml build fails with SIGABRT
Categories
Build dependencies
Files
- /usr/local/bin/mergiraf