summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* dev-python/three-merge: x86 stable (bug #760531)Thomas Deutschmann2020-12-201-1/+1
| | | | | Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
* dev-python/three-merge: Stabilize 0.1.1 amd64, #760531Sam James2020-12-191-1/+1
| | | | Signed-off-by: Sam James <sam@gentoo.org>
* dev-python/three-merge: lib to perform 3-way merge between stringsAndrew Ammerlaan2020-11-173-0/+43
Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net> Signed-off-by: Joonas Niilola <juippis@gentoo.org>