I just ran across this in a thread on another mailing list —
google-diff-match-patch is a library* for performing diff and patch operations on plain text:
Two texts can be diffed against each other, generating a list of patches. These patches can then be applied against a third text. If the third text has edits of its own, this version of patch will apply its changes on a best-effort basis, reporting which patches succeeded and which failed.
In other words, this can be used to merge conflicts in natural-language strings, using the common ancestor revision as a reference. Could be very useful in replicated wikis, CMS's, or lots of other applications where multiple users can edit a piece of text.
—Jens
* "Currently available in Java, JavaScript, Dart, C++, C#, Objective C, Lua and Python". Apache licensed :)