summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* dev-python/three-merge: enable py3.10Andrew Ammerlaan2021-06-051-2/+2
* dev-python/three-merge: x86 stable (bug #760531)Thomas Deutschmann2020-12-201-1/+1
* dev-python/three-merge: Stabilize 0.1.1 amd64, #760531Sam James2020-12-191-1/+1
* dev-python/three-merge: lib to perform 3-way merge between stringsAndrew Ammerlaan2020-11-171-0/+26