DiffMerge- Excellent Free Diff and Merge Utility
(About.com) At work I use Araxis Merge which is an excellent Enterprise Merge/Compare tool. Unfortunately it's not free as 'Enterprise' almost always means expensive. However the impressive SourceGear's DiffMerge is free, is an excellent comparison and merge too
Update update feed set failed_fetches=0, fetched=current_timestamp() where feed_id = 1123 failed: 1142 [UPDATE command denied to user '334187_hdlns_ms5'@'10.187.248.89' for table 'feed'] in [update feed set failed_fetches=0, fetched=current_timestamp() where feed_id = 1123]
updated 1123 (C C++), inserted 10, updated 0, at 2012-05-30 19:42:10