ydiff
diffr
| ydiff | diffr | |
|---|---|---|
| 2 | 3 | |
| 844 | 519 | |
| - | - | |
| 6.4 | 5.7 | |
| about 1 month ago | 29 days ago | |
| Python | Rust | |
| GNU General Public License v3.0 or later | MIT License |
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
diffr
-
How to see word-diff and moved lines?
I use diffr since, it shows small changes in long lines nicely.
-
Meld is a visual diff and merge tool targeted at developers
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.
-
Difftastic: Syntax-aware structured diff tool
I wrote diffr [0] for that purpose; it serves me well, especially if your team makes code with long lines.
In my opinion, a simple approach that does NOT make any parsing is more efficient (what about bugs in your parser? code with syntax errors? also, how fast would the parser be?)
[0]: https://github.com/mookid/diffr
What are some alternatives?
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.
gumtree - An awesome code differencing tool
json-diff - Structural diff for JSON files
difftastic - a structural diff that understands syntax 🟥🟩
deadgrep - fast, friendly searching with ripgrep and Emacs
locust - "git diff" over abstract syntax trees
hdiff - Hash-based Diffing for AST's
kdiff3 - KDiff3 updated for Windows
wordle - Wordle TUI in Rust
meld - Meld