We Don't Use Software That Costs Money Here

blog
95

The merge tool that comes with Perforce (P4Merge) is great. It does three way merges to boot and is free. A few people here use SourceGear DiffMerge, also free.