notbugAs an Amazon Associate I earn from qualifying purchases.
Want a good read? Try FreeBSD Mastery: Jails (IT Mastery Book 15)
All times are UTC
Ukraine
Port details
py-merge3 3-way merge implementation
0.0.13 textprocnew! on this many watch lists=0 search for ports that depend on this port Find issues related to this port Report an issue related to this port View this port on Repology. pkg-fallout Port not present on quarterlyThis is expected as this port was created during this quarter.
Maintainer: fullermd@over-yonder.net search for ports maintained by this maintainer
Port Added: 2023-05-25 09:46:20
Last Update: 2023-05-25 09:39:34
Commit Hash: 482b709
Also Listed In: python
License: GPLv2+
Description:
Homepage    cgit ¦ Codeberg ¦ GitHub ¦ GitLab ¦ SVNWeb - no subversion history for this port
pkg-plist: as obtained via: make generate-plist
There is no configure plist information for this port.
Dependency lines:
  • ${PYTHON_PKGNAMEPREFIX}merge3>0:textproc/py-merge3@${PY_FLAVOR}
To install the port:
cd /usr/ports/textproc/py-merge3/ && make install clean
To add the package, run one of these commands:
  • pkg install textproc/py-merge3
  • pkg install py39-merge3
NOTE: If this package has multiple flavors (see below), then use one of them instead of the name specified above.
NOTE: This is a Python port. Instead of py39-merge3 listed in the above command, you can pick from the names under the Packages section.
PKGNAME: py39-merge3
Package flavors (<flavor>: <package>)
  • py39: py39-merge3
distinfo:

Packages (timestamps in pop-ups are UTC):
py39-merge3
ABIlatestquarterly
FreeBSD:11:aarch64pkg-falloutpkg-fallout
FreeBSD:11:amd64pkg-falloutpkg-fallout
FreeBSD:11:armv6pkg-falloutpkg-fallout
FreeBSD:11:i386pkg-falloutpkg-fallout
FreeBSD:11:mipspkg-falloutpkg-fallout
FreeBSD:11:mips64pkg-falloutpkg-fallout
FreeBSD:12:aarch64pkg-falloutpkg-fallout
FreeBSD:12:amd64pkg-falloutpkg-fallout
FreeBSD:12:armv6pkg-falloutpkg-fallout
FreeBSD:12:armv7pkg-falloutpkg-fallout
FreeBSD:12:i386pkg-falloutpkg-fallout
FreeBSD:12:mipspkg-falloutpkg-fallout
FreeBSD:12:mips64pkg-falloutpkg-fallout
FreeBSD:12:powerpc64pkg-falloutpkg-fallout
FreeBSD:13:aarch64pkg-falloutpkg-fallout
FreeBSD:13:amd64pkg-falloutpkg-fallout
FreeBSD:13:armv6pkg-falloutpkg-fallout
FreeBSD:13:armv7pkg-falloutpkg-fallout
FreeBSD:13:i3860.0.13pkg-fallout
FreeBSD:13:mipspkg-falloutpkg-fallout
FreeBSD:13:mips64pkg-falloutpkg-fallout
FreeBSD:13:powerpc64pkg-falloutpkg-fallout
FreeBSD:13:riscv64pkg-falloutpkg-fallout
FreeBSD:14:aarch64pkg-falloutpkg-fallout
FreeBSD:14:amd64pkg-falloutpkg-fallout
FreeBSD:14:armv6pkg-falloutpkg-fallout
FreeBSD:14:armv7pkg-falloutpkg-fallout
FreeBSD:14:i386pkg-falloutpkg-fallout
FreeBSD:14:mipspkg-falloutpkg-fallout
FreeBSD:14:mips64pkg-falloutpkg-fallout
FreeBSD:14:powerpc64pkg-falloutpkg-fallout
FreeBSD:14:riscv64pkg-falloutpkg-fallout
 
Dependencies
NOTE: FreshPorts displays only information on required and default dependencies. Optional dependencies are not covered.
Build dependencies:
  1. py39-setuptools>=63.1.0 : devel/py-setuptools@py39
  2. python3.9 : lang/python39
Test dependencies:
  1. python3.9 : lang/python39
Runtime dependencies:
  1. py39-setuptools>=63.1.0 : devel/py-setuptools@py39
  2. python3.9 : lang/python39
There are no ports dependent upon this port

Configuration Options:
Options name:
USES:
FreshPorts was unable to extract/find any pkg message
Master Sites:
Expand this list (2 items)
Collapse this list.
  1. https://files.pythonhosted.org/packages/source/m/merge3/
  2. https://pypi.org/packages/source/m/merge3/
Collapse this list.

Number of commits found: 1

Commit History - (may be incomplete: for full details, see links to repositories near top of page)
CommitCreditsLog message
0.0.13
25 May 2023 09:39:34
commit hash:482b709de36de5949cb55d43da9b08bc51bcc07ccommit hash:482b709de36de5949cb55d43da9b08bc51bcc07ccommit hash:482b709de36de5949cb55d43da9b08bc51bcc07ccommit hash:482b709de36de5949cb55d43da9b08bc51bcc07c files touched by this commit
Robert Clausecker (fuz) search for other commits by this committer
Author: Matthew D. Fuller
textproc/py-merge3: new port

A Python implementation of 3-way merge of texts.

Given BASE, OTHER, THIS, tries to produce a combined text incorporating
the changes from both BASE->OTHER and BASE->THIS. All three will
typically be sequences of lines.

WWW: https://github.com/breezy-team/merge3

PR:		267681

Number of commits found: 1