sync ports with The Matrix

This commit is contained in:
purplerain 2023-09-22 16:24:11 +00:00
parent 4cc27cb2e4
commit 130329df10
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
773 changed files with 5162 additions and 2980 deletions

View file

@ -0,0 +1,4 @@
Simple Python library to perform a 3-way merge between strings,
based on diff-match-patch. This library performs merges at a character
level, as opposed to most VCS systems, which opt for a line-based
approach.

View file

@ -0,0 +1,14 @@
lib/python${MODPY_VERSION}/site-packages/three_merge/
lib/python${MODPY_VERSION}/site-packages/three_merge-${MODPY_EGG_VERSION}.dist-info/
lib/python${MODPY_VERSION}/site-packages/three_merge-${MODPY_EGG_VERSION}.dist-info/LICENSE
lib/python${MODPY_VERSION}/site-packages/three_merge-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/three_merge-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/three_merge-${MODPY_EGG_VERSION}.dist-info/WHEEL
lib/python${MODPY_VERSION}/site-packages/three_merge-${MODPY_EGG_VERSION}.dist-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/three_merge/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/three_merge/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/three_merge/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/three_merge/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/three_merge/${MODPY_PYCACHE}merge.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/three_merge/${MODPY_PYCACHE}merge.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/three_merge/merge.py