Today Adaptigo released a new version of TiddlyWinFileMerge which
lets people who use TiddlyWiki merge their files with files that others
have edited. So if you have a bunch of notes in a wiki file and you
email it to a friend that adds more notes and edits some notes then
this tool will let you easily combine your work together into one file.
By the way, TiddlyWiki is an awesome tool and even better is the MonkeyGTD 2.1 alpha (preview). These tools are so incredibly good for organizing your thoughts, tracking projects and keeping notes. I use it everyday.
Today (2/9/2007) Adaptigo contributed money to a a person on Kiva.
http://www.kiva.org/lender/adaptigo