I really like Araxis Merge for a graphical DIFF program for the PC. I have no idea what's available for linux, though. We're running SUSE linux on our z800 mainframe. I'd be most grateful if I could get a few pointers to what programs everyone else likes.
BeyondCompare has also just been released in a Linux version.
Not free, but the Windows version is worth every penny - I'm assuming the Linux version is the same.
If you use Vim, you can use the inbuilt diff functionality. vim -d file1 file2
takes you right into the diff screen, where you can do all sort of merge and deletes.
Diffuse (http://diffuse.sourceforge.net/) is also very good. It even lets you easily adjust how lines are matched up.
I am using ubuntu and installed meld package. Meld is a very good graphical diff/merge program.
xxdiff is lightweight if that's what you're after.
I have used Meld once, which seemed very nice, and I may try more often. vimdiff works well, if you know vim well. Lastly I would mention I've found xxdiff does a reasonable job for a quick comparison. There are many diff programs out there which do a good job.
There is DiffMerge from SourceGear. It's pretty good. Araxis Merge is one of the programs I miss from Windows. I wonder if it works under Wine ;) Might have to give it a try
Subclipse for Eclipse has an excellent graphical diff plugin if you are using SVN (subversion) source control.
I generally need to diff codes from subversion repositories and so far eclipse has worked really nicely for me... I use KDiff3 for other works.
I use Guiffy and it works well.
(source: guiffy.org)
来源:https://stackoverflow.com/questions/112932/graphical-diff-programs-for-linux