DiffMerge

SqueakSource project page

Differencing and merge tools, for text and other kinds of data.

As of DiffMerge-tonyg.4.mcz, includes a Hunt-McIlroy text diff implementation, and a Diff3 implementation constructed atop it.

DiffMerge-tonyg.5.mcz
Kerala-ab.21.mcz
DiffMerge-tonyg.4.mcz