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:346374 Subscription: http://www.houseoffusion.com/groups/cf-talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/groups/cf-talk/unsubscribe.cfm