after all these years i still mostly use kdiff3
It remains the best option for 3-way merge. For diff, I find myself just reading the raw diff output.
Works fine for 2-way diffs too
Meld is a visual diff and merge tool targeted at developers
21–30 of 146 posts
Re: Meld is a visual diff and merge tool targeted at developers
#22For visualization I really like kdiff3.
Or on terminals https://github.com/mookid/diffr with specific settings that use 256 colors for highlighting 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.
Re: Meld is a visual diff and merge tool targeted at developers
#23On Windows, how does Meld compare with WinMerge[0]?
[0]: https://winmerge.org
Re: Meld is a visual diff and merge tool targeted at developers
#24Yeah I know I'm an emacs zealot, but emerge works fine for me.
Re: Meld is a visual diff and merge tool targeted at developers
#25With the switch to GTK3, it no longer fits on my screen (and headerbars stand out like a sore thumb too). Kdiff3 was confusing for a moment, but does a good job too.
Re: Meld is a visual diff and merge tool targeted at developers
#26BeyondCompare is much better and available on macOS too.
I've been a passionate Beyond Compare user for about 2 decades now. I swear by it. Great for diffing images as well.
Re: Meld is a visual diff and merge tool targeted at developers
#27BeyondCompare is much better and available on macOS too.
Another vote for Beyond Compare here, 10 years service with Git.
Re: Meld is a visual diff and merge tool targeted at developers
#28On 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
git diff "$@" | ydiff -s --wrap --width=0
Re: Meld is a visual diff and merge tool targeted at developers
#29On Windows, how does Meld compare with WinMerge[0]? [0]: https://winmerge.org
WinMerge is better. It has better UI: bottom line comparison, keyboard shortcuts, copy left to right and vice-versa, lots of preferences settings, etc. Too bad it is Windows-only.
If you can accept a paid version of WinMerge for Linux and Mac I'd highly recommend BeyondCompare (U$ 30.00).
Re: Meld is a visual diff and merge tool targeted at developers
#30I'm an xxdiff man myself: https://furius.ca/xxdiff/
I don't like the whole "balloons with tails" thing meld does. xxdiff strikes the best balance between "being a graphical tool" and "not having distracting clutter" in my opinion.