ydiff
kdiff3
ydiff | kdiff3 | |
---|---|---|
2 | 1 | |
844 | 4 | |
- | - | |
6.4 | 0.0 | |
about 1 month ago | about 2 years ago | |
Python | C++ | |
GNU General Public License v3.0 or later | - |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
ydiff
-
Difftastic: A diff that understands syntax
I find ydiff more useful, specially for the side-by-side output: https://github.com/ymattw/ydiff
I'm using it like "git-ydiff-s" script in my PATH to use "git ydiff-s":
#!/bin/sh
-
Meld is a visual diff and merge tool targeted at developers
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
kdiff3
-
Meld is a visual diff and merge tool targeted at developers
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).
What are some alternatives?
diffr - Yet another diff highlighting tool
meld - Meld
diffuse - 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.
json-diff - Structural diff for JSON files
deadgrep - fast, friendly searching with ripgrep and Emacs
hdiff - Hash-based Diffing for AST's
wordle - Wordle TUI in Rust
difftastic - a structural diff that understands syntax 🟥🟩