OpenDocument, diff, and revision-control - a few ideas on how to work with .odt and versioning. I might be able to use this for VoodooPad as well. However, I not only want to diff, but also merge - in order to sync cleanly between multiple machines. But as it looks, my best chances might be in git - my Mercurial integration works, but I have to limit VoodooPad quite a bit in features (all pages must be plain text at the moment). Or I build even more tools around Mercurial to automatically convert the RTF pages. None of this is really optimal - actually, it would suffice if I could sync cleanly with a lighttpd-based webdav, because MobileMe is just incredibly slow.