views:

7215

answers:

15

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 linix on our z800 mainframe. I'd be most grateful if I could get a few pointers to what programs everyone else likes.

Thanks, Scott

+15  A: 

I know of two graphical diff programs: Meld and KDiff3. I haven't used KDiff3, but Meld works well for me.

It seems that both are in the standard package repositories for openSUSE 11.0

faran
I've found Meld to be pretty powerful also, although it does tend to be a sluggish on very large files.
stephen mulcahy
+1  A: 

Meld and KDiff are two of the most popular.

John Millikin
+1  A: 

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

Daniel
+7  A: 

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.

moobaa
BeyondCompare is great IMO, better than all the integrated-with-version-control diff tools and ide-packaged or OS standard diff tools I've ever used. +1
davenpcj
This is a great windows app, I've never used it on Linux.
Daniel
A: 

Meld is frickin' awesome. Seriously.

A: 

Subclipse for Eclipse has an excellent graphical diff plugin if you are using SVN (subversion) source control.

thesmart
A: 
Alex B
We used to Guiffy at work until we discovered several very serious issues with it. For example, on large files it may merge part of the file, then just fail, leaving a partially merged file. It had even more interesting issues as well, like graphical ">" characters becoming a part of the merge.
A: 

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.

pvsnp
+3  A: 

If you use vim, you can use the inbuilt diff functionality. vi -d file1 file2 takes you right into the diff screen.. where you can do all sort of merge and deletes.

Sridhar Iyer
The prime advantage of using an editor to 'diff' files is that you can manually edit the files in place.Additionally, VIM automatic diff folding lets you see just the differences and expand the hidden code only when you need it.
nimrodm
A: 

Kompare is fine for diff, but I use dirdiff. Although it looks ugly, dirdiff can do 3-way merge - and you can get everything done inside the tool (both diff and merge).

Milan Babuškov
+1  A: 

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.

MattG
+1  A: 

xxdiff is lightweight if that's what you're after.

Tarski
+3  A: 

Diffuse (http://diffuse.sourceforge.net/) is also very good. It even lets you easily adjust how lines are matched up.

A: 

I am using ubuntu and installed meld package. Meld is a very good graphical diff/merge program.

A: 

Emacs comes with Ediff.

EdiffScreenshot

kmkaplan