Merging Code

[mysh]

I am having issues with my site and I think I have located the problem. I am using stock by attribute and then installed fast and easy checkout. I realized the second mod copied over 2 files of the first mod.
THe 2 files both order.php files are huge and i am not very good with php.

Is there a quick way to merge code or do I actually have to read over 3000 lines of code to find the differences?

[torvista]

Winmerge - free
Beyond Compare - free to try
I prefer Beyond Compare, I could not work without it:
set up an FTP profile to compare your remote site and your local testing site.

[mysh]

thanks for the suggestions. I have a mac and read beyond compare and kaleidoscope were close so I tried that one out