Fri, 06 Nov 2026 11:21:42 UTC Log in
Python implementation of 3-way merge built by guoguo completed Sat, 17 Oct 2026 11:04:24 UTC

Description

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.

RPMs

2 files, 2 arches
src
  • python-merge3-0.0.16-19.fc45.src.rpm 49.98 KB info · download
noarch
  • python3-merge3-0.0.16-19.fc45.noarch.rpm 36.68 KB info · download

Logs

noarch

Changelog

* Thu Sep 03 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 0.0.16-19
- Use the provisional pyproject declarative buildsystem

* Thu Sep 03 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 0.0.16-18
- Use pyproject long options

* Thu Sep 03 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 0.0.16-17
- Diverge Fedora from EPEL10

* Thu Sep 03 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 0.0.16-16
- Use the GitHub project as the package URL

* Thu Sep 03 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 0.0.16-15
- Replace verbose-tests patch with an upstreamed version

* Thu Sep 03 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 0.0.16-14
- Add a man page

* Thu Sep 03 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 0.0.16-12
- Assert that .dist-info contains a license file

* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.16-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 0.0.16-4
- Rebuilt for Python 3.15

* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

* Mon Dec 15 2025 Michel Lind <salimma@fedoraproject.org> - 0.0.16-2
- Restore support for building with old setuptools

* Mon Dec 15 2025 Michel Lind <salimma@fedoraproject.org> - 0.0.16-1
- Update to 0.0.16 upstream release
- Resolves: rhbz#2404256

* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 0.0.15-6
- Rebuilt for Python 3.14.0rc3 bytecode

* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 0.0.15-5
- Rebuilt for Python 3.14.0rc2 bytecode

* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.15-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 0.0.15-3
- Rebuilt for Python 3.14

* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

* Thu Sep 05 2024 Michel Lind <salimma@fedoraproject.org> - 0.0.15-1
- Update to version 0.0.15; Fixes: RHBZ#2239321