Alternative for WinMerge in Ubuntu

I need to compare/diff/merge files in an easy way. In windows I would use WinMerge. What alternatives for this are available in Ubuntu?

The things I must be able to do:

See 2 files line by line next to each other, with the differences highlighted
Have an option for merging this files together

Peter Smit

Posted 2009-07-23T09:53:43.110

Reputation: 7 906

Are you looking for a form of synchronization tools? – Ivo Flipse – 2009-07-23T09:58:15.563

1I'll just note that in a pinch, when Meld hasn't been quite up to snuff, I've used WinMerge running under WINE. – Evan – 2009-07-23T11:03:00.400

Answers

Meld (alternative link)

Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. Look at the screenshots page for more detailed features.

alt text

Ivo Flipse

Posted 2009-07-23T09:53:43.110

Reputation: 24 054

I accepted this answer, but as far I can see, diffuse is a as good option. – Peter Smit – 2009-07-24T10:53:28.017

Thanks! This is great! (I will only wait a small moment more, before I accept your answer) – Peter Smit – 2009-07-23T10:18:00.693

Not in a hurry ;-) Glad you liked it! – Ivo Flipse – 2009-07-23T10:39:18.600

I like diffuse:

Diffuse is a graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line-matching and directly edit files. Diffuse can also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK repositories for comparison and merging.

enter image description here

ihuston

Posted 2009-07-23T09:53:43.110

Reputation: 293

It does not support comparing dirrectories, very sad. – pavelkolodin – 2014-08-14T07:15:14.890

Then I'll just upvote Diffuse ;-) – Ivo Flipse – 2009-07-24T10:57:38.413

Great! And this one is also in the repository! – Peter Smit – 2009-07-23T10:32:02.253

gvimdiff is handy for quick comparisons. Install gvim to get it.

enter image description here

therefromhere

Posted 2009-07-23T09:53:43.110

Reputation: 7 294

1This will be surely a good one for vim users. (So not for me, I don't like vim) – Peter Smit – 2009-07-23T11:17:04.530

KDiff3 is cross-platform and has advanced line and character diff capability. See more about its features here.

alt text

mutewinter

Posted 2009-07-23T09:53:43.110

Reputation: 767

I can't say that I find its interface intuitive. – anatoly techtonik – 2015-02-17T04:58:24.983

Beyond Compare, supports Ubuntu 6.06 - 9.04, at least 32-bit.

Lasse V. Karlsen

Posted 2009-07-23T09:53:43.110

Reputation: 3 196

The open-source tool Kompare is worth adding to your diff tools on linux:

It makes effective use of color
It works great form the command line to pipe recursive multi-file diff sets directly from Subversion (or any other version control system)

[~/path/to/project/source]$svn diff | kompare -o -
Works great with Gnome Ubuntu even though it is a KDE native app.

To install on ubuntu: $sudo apt-get install kompare

Heston T. Holtmann

Posted 2009-07-23T09:53:43.110

Reputation: 395

No screenshots is a fail. =) – anatoly techtonik – 2015-05-14T06:54:12.003