./textproc/py-merge3, Python implementation of 3-way merge

[ CVSweb ] [ Homepage ] [ RSS ] [ Required by ] [ Add to tracker ]

Branch: CURRENT, Version: 0.0.15, Package name: py312-merge3-0.0.15, Maintainer: rhialto

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.

Master sites:

Filesize: 13.79 KB

Version history: (Expand)

CVS history: (Expand)


   2024-11-11 08:29:31 by Thomas Klausner | Files touched by this commit (862) 
Log message:
py-*: remove unused tool dependency

py-setuptools includes the py-wheel functionality nowadays
   2024-05-22 09:04:07 by Adam Ciarcinski | Files touched by this commit (2) | Package updated
Log message:
py-merge3: updated to 0.0.15

0.0.15
Migrate to ruff
Support building wheels
Add dependabot config
   2024-01-07 17:03:46 by Thomas Klausner | Files touched by this commit (1) 
Log message:
py-merge3: add missing tools, simplify download URL
   2024-01-07 16:57:02 by Olaf Seibert | Files touched by this commit (4) 
Log message:
textproc/py-merge3: added, needed for devel/breezy.