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...