mirror of
https://git.freebsd.org/ports.git
synced 2025-06-01 19:06:28 -04:00
482b709de3
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. WWW: https://github.com/breezy-team/merge3 PR: 267681
5 lines
220 B
Text
5 lines
220 B
Text
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.
|