blob: 4c2f4c248e37f858aeb1ae2bcbfc65cc79bf090d (
plain) (
blame)
1
2
3
4
5
|
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.
|
