Aaron Feng

For anyone that is tired of not being able to do a 3 way merge or directory comparsion with your diff tool- Sourcegear is offering a cross platform diff tool to do just that. Best of all, it's FREE. DiffMerge 3.0 can be downloaded from here.