Comparing text files together

[imported_KuJaX]

Can someone recommend a program where I can compare two files (like text files, php files, etc) and the program will highlight or outline or tell me what differences there are between the two files.

This is used because I just got a lot of programming stuff done and I want to see exactly how the programmer did it, but I don't want to open up thousands of different files to look through them.

 

[QED]

GVIM with the diff option

Just about any decent IDE...

 

[MrChad]

Araxis Merge is excellent, but a bit expensive.

I've never used UltraCompare, but UltraEdit is outstanding, so it might be worth checking out the free trial.

 

[Jack Ryan]

http://winmerge.sourceforge.net/

 

[homercles337]

Vice Versa?

 

[jjones]

EditPad does it and there's a free version available.

 

[cKGunslinger]

WinMerge, FTW!

 

[notfred]

diff

 

[nova2]

winmerge or kdiff will work. it's good to have both, actually.

i think you may prefer winmerge most of the time, however.

i've used winmerge a ton on a large codebase, it works great, especially after modifying it to open files at the correct line inside UltraEdit, to which I submitted a patch for.

 

[mchammer]

Originally posted by: Jack Ryan
http://winmerge.sourceforge.net/

 

[kamper]

Originally posted by: MrChad
Araxis Merge is excellent, but a bit expensive.

QFT, especially their filesystem comparer. Very good for merging branches.

TortoiseSVN also comes with a very competent visual differ although I don't know if it comes seperately or if you have to install the whole thing.

And, of course, good ol' diff.

 

[kobymu]

Just use fc /? and the command prompt.

 

[xtknight]

Anyone know of a good freeware binary diff?