Changes — FileMerge Replacement
Ian Baird recently released Changes which is an application to show differences between two folders and merge these intelligently.
I know this is not an uncommon task among many TextMate users, as I have received quite a lot of requests for building such functionality — Changes of course has TextMate integration, so this application will hopefully satisfy a lot of you.
Version 1.0 of Changes is available for $39.95 (free trial) but if you use
TEXTMATE0308 as coupon code you can get it for $29.95 (offer lasts throughout March 2008).