The one I'm liking the most so far is P4merge. It's part of the Perforce system, but is free, cross platform, and works great with other SCMs like Git.
http://www.perforce.com/product/components/perforce_visual_merge_and_diff_tools http://www.perforce.com/downloads/complete_list On 7/27/11 12:04 PM, Larry Lyons wrote: > Another good diff tool is WinMerge (http://www.winmerge.org) its a free diff > and merge tool. > >> I use Beyonf Compare for stuff like this and I have to say I probably >> couldn't live without this tool now, it is soooo useful. >> You can compare files locally, or even an FTP connection and deploy changes >> to your live site this way. >> you can merge line by line of course. >> >> Seriously, try it out, the trial version never expires either. >> >> http://www.scootersoftware.com/ >> >> Russ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Order the Adobe Coldfusion Anthology now! http://www.amazon.com/Adobe-Coldfusion-Anthology/dp/1430272155/?tag=houseoffusion Archive: http://www.houseoffusion.com/groups/cf-talk/message.cfm/messageid:346375 Subscription: http://www.houseoffusion.com/groups/cf-talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/groups/cf-talk/unsubscribe.cfm
