Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

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
share|improve this question
    
Are you looking for a form of synchronization tools? –  Ivo Flipse Jul 23 '09 at 9:58
    
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
add comment

6 Answers

up vote 20 down vote accepted

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 alt text

share|improve this answer
    
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
add comment

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

share|improve this answer
    
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
add comment

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

enter image description here

share|improve this answer
    
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
add comment

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

alt text

share|improve this answer
add comment

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

share|improve this answer
add comment

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

  1. It makes effective use of color
  2. 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 -

  3. Works great with Gnome Ubuntu even though it is a KDE native app.

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

share|improve this answer
add comment

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.