Alternative for WinMerge in Ubuntu

Question

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

I'll just note that in a pinch, when Meld hasn't been quite up to snuff, I've used WinMerge running under WINE. — Evan, Jul 23 '09 at 11:03

score 27 · Accepted Answer · edited Aug 28 '20 at 16:02

27

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

edited Aug 28 '20 at 16:02

tuket

123
6

answered Jul 23 '09 at 09:59

Ivo Flipse

24,696
32
103
147

Thanks! This is great! (I will only wait a small moment more, before I accept your answer) – Peter Smit Jul 23 '09 at 10:18
Not in a hurry ;-) Glad you liked it! – Ivo Flipse Jul 23 '09 at 10:39
I accepted this answer, but as far I can see, diffuse is a as good option. – Peter Smit Jul 24 '09 at 10:53

score 12 · Answer 2 · edited Aug 16 '11 at 05:16

12

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

edited Aug 16 '11 at 05:16

Gaff

18,569
15
57
68

answered Jul 23 '09 at 10:22

ihuston

293
3
7

Great! And this one is also in the repository! – Peter Smit Jul 23 '09 at 10:32
Then I'll just upvote Diffuse ;-) – Ivo Flipse Jul 24 '09 at 10:57
It does not support comparing dirrectories, very sad. – pavelkolodin Aug 14 '14 at 07:15

score 5 · Answer 3 · edited Aug 16 '11 at 05:15

5

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

enter image description here

edited Aug 16 '11 at 05:15

Gaff

18,569
15
57
68

answered Jul 23 '09 at 11:13

therefromhere

8,412
10
42
43

1

This will be surely a good one for vim users. (So not for me, I don't like vim) – Peter Smit Jul 23 '09 at 11:17

score 3 · Answer 4 · edited Sep 20 '11 at 05:27

3

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

alt text

edited Sep 20 '11 at 05:27

Gaff

18,569
15
57
68

answered Jul 23 '09 at 12:10

mutewinter

787
3
10
16

I can't say that I find its interface intuitive. – anatoly techtonik Feb 17 '15 at 04:58

score 2 · Answer 5 · answered Jul 23 '09 at 10:15

2

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

answered Jul 23 '09 at 10:15

Lasse V. Karlsen

3,656
10
41
58

score 1 · Answer 6 · answered Apr 12 '10 at 22:04

1

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

answered Apr 12 '10 at 22:04

Heston T. Holtmann

435
5
13

No screenshots is a fail. =) – anatoly techtonik May 14 '15 at 06:54

Alternative for WinMerge in Ubuntu

6 Answers6