blob: 3c966ed7189c51b910506bccdf32b18a1dff8964 (
plain) (
blame)
1
2
3
|
Simple Python library to perform a 3-way merge between strings, based on
diff-match-patch. This library performs merges at a character level, as
opposed to most VCS systems, which opt for a line-based approach.
|