HomeFreeBSD

textproc/py-merge3: new port

Description

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

Details

Provenance
fullermd_over-yonder.netAuthored on Mar 26 2023, 9:55 PM
fuzCommitted on May 25 2023, 9:39 AM
Parents
R11:a1fbebbcb6fc: sysutils/py-py-cpuinfo: fix on armv7, add lscpu dependency
Branches
Unknown
Tags
Unknown

Event Timeline

fuz committed R11:482b709de36d: textproc/py-merge3: new port (authored by Matthew D. Fuller <fullermd@over-yonder.net>).May 25 2023, 9:39 AM