Meld is a visual diff and merge tool targeted at developers

• meld

  38 18 4.3 Python

  Meld (by noamraph)

• diffr

  3 519 5.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.

• InfluxDB

  www.influxdata.com featured

  Power Real-Time Data Analytics at Scale. Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.

  

• ydiff

  2 844 6.4 Python

  View colored, incremental diff in workspace or from stdin with side by side and auto pager support

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

• diffuse

  3 250 6.6 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

• kdiff3

  1 4 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).

• SaaSHub

  www.saashub.com featured

  SaaSHub - Software Alternatives and Reviews. SaaSHub helps you find the best software and product alternatives

  

Suggest a related project