Code Comparison software

Question

I have two directories with hundreds of PHP files in each. The second directory was copied from the first and worked on as a 'bad' way of version control. The issue is, we don't know which files were necessarily changed (the programmer did not provide any notes) and if they were, what was changed.

I have seen software which can compare the difference in two individually known text files but I am looking for something that can read all files in the directories (say PHP) and compare them.

Anybody know of something that might help?

EDIT

I am currently running all my code on an XAMPP setup on a Windows XP machine.

Answer 1

I use Winmerge in Windows. For Linux, there's a good list here

Answer 2

i can absolutely an fully recommend BeyondCompare by Scootersoftware. IMHO it's the Photoshop of diff/merge tools. http://scootersoftware.com/

You might also want to check here for other tools: http://alternativeto.net/software/beyond-compare