[energy123]

What diffing/patching/merging library are you working with? Or are you building your own?

[fritzo]

I've used google's old diff-match-patch, a faster python binding of that C++ library fast-diff-match-patch, and biopython (which amazingly supports unicode!)