Comment Visual SlickEdit (Score 1) 18
VSE has a really nifty diff/merge utility (Diffzilla). It's saved my butt at the last two companies. You can point it at two different directories, and it'll show you all of the different files in both directories. You can then merge changes back and forth either visually or automatically. Editing in the diff windows is also supported. VSE is a terrific editor and is available on multiple platforms. www.slickedit.com is their website.
