Meld is a visual diff and merge tool targeted at developers

1. meld

   1 43 20 7.7 Python

   Meld (by noamraph)

   

2. AppSignal

   www.appsignal.com sponsored

   AppSignal knows why the f*#k it crashed. Stop vibe-debugging. Every exception, every backtrace, grouped so you see patterns, not noise.

   

3. diffr

   2 4 615 3.7 Rust

   Yet another diff highlighting tool

   

   For visualization I really like kdiff3. Or on terminal https://github.com/mookid/diffr with specific settings that use 256 colors the highlights word differences as well.

   But for manual merging I haven't found anything better than ediff. That's the only reason I install emacs on my work machines. Seemless integration into a text editor is just unbeatable.

4. ydiff

   3 2 932 6.4 Python

   View colored, incremental diff in workspace or from stdin, side by side and auto paged.

   

   On the terminal I find `ydiff -s --wrap --width=0` very good for a comprehensible side-by-side diff: https://github.com/ymattw/ydiff

   I definded this wrapper script ~/bin/git-ydiff-s:

       #!/bin/sh

5. diffuse

   4 3 335 6.4 Python

   Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories. (by MightyCreak)

   

   I use both Meld and Diffuse[1] depending on what I do. I find Diffuse to represent diffs better visually, while Meld being better for actually merging contents.

   [1]: https://github.com/MightyCreak/diffuse

6. kdiff3

   5 1 6 0.0 C++

   KDiff3 updated for Windows (by michaelxzhang)

   

   kdiff3 does have a modern version: https://invent.kde.org/sdk/kdiff3/.

   Unfortunately versions starting at 1.9.0 are drastically buggier than 1.8.5: Ctrl+C being incorrectly enabled and disabled (https://bugs.kde.org/show_bug.cgi?id=444636), merge errors (https://bugs.kde.org/show_bug.cgi?id=437570, fixed), drastic slowdown when loading CRLF files (https://bugs.kde.org/show_bug.cgi?id=450411, fixed), recurring assertion errors (didn't personally encounter, but https://bugs.kde.org/show_bug.cgi?id=426301, https://bugs.kde.org/show_bug.cgi?id=442618), large chunks of Git history producing unusable binaries that corrupt memory or print assertion errors when loading files, etc. I stopped following KDiff3 development and decided to pin 1.8.5 on my system, which actually works.

   Another fork of KDiff3 is https://github.com/michaelxzhang/kdiff3. I haven't tested it, but I hope the alternative diff coloration makes it easier to see single-word/space insertions and deletions within a line (which is something I often fail to notice in mainline KDiff3).

7. Kargo

   akuity.io sponsored

   Stop Scripting Promotions. Start Shipping with Kargo. Kargo automates promotion across dev, staging, and prod with approval gates and verification. Open source, built by the team behind Argo CD. Download now.

   

Suggest a related project