blob: f44987d7b57fdb1aeff96e9dc8c05c067bd199df (
plain)
1
2
3
4
|
three-merge is a 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.
|