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.
Meld is a visual diff and merge tool targeted at developers
11–20 of 146 posts
Re: Meld is a visual diff and merge tool targeted at developers
#12It's not open source, and comes with all the baggage of perforce, but p4merge and p4diff are just excellent tools that I install on every machine I work on.
How is it not open source? The very first download link is to download the source. And it’s GPLv2 licensed.
They’re talking about the p4 tool they use
Re: Meld is a visual diff and merge tool targeted at developers
#13If you want to use it with git: git config --global diff.tool meld git config --global --add difftool.prompt false And use git difftool instead of git diff
On my Ubuntu based (Xubuntu, Mint) workstations this works without any configuration
$ meld .Re: Meld is a visual diff and merge tool targeted at developers
#14BeyondCompare is much better and available on macOS too.
Re: Meld is a visual diff and merge tool targeted at developers
#15I've been using Meld since years ago, and it's my default go-to diff viewer. The visual style they implemented helps me a lot to reason about how lines have been added or deleted from documents in the side by side comparison. Very neat!
The directory contents tree diff is also really useful.
I wish they made it even easier the basic case of comparing aribtrary text. Maybe it should be the default mode after opening the program, instead of having to click on a couple buttons, because I use it a lot to manually paste pieces of text. For example, logs from a server during testing, to compare what went different between runs.
Another welcomed addition would be "ignore masks". Some kind of regex input that could be used to quickly tell Meld which parts of the text to skip comparing. That way, comparison of log files could be made where a timestamps column would be ignored.
Re: Meld is a visual diff and merge tool targeted at developers
#16IMHO, Meld is the second best open source tool for doing this.
On Windows, WinMerge[1] is a better alternative. Too bad is Windows only.
For a non-FOSS and cross platform solution I recommend BeyondCompare (U$30.00)[2]. It replicates most of WinMerge UI.
Re: Meld is a visual diff and merge tool targeted at developers
#17Meld is great. The only nitpick I have is that winmerge was more efficient in resolving a file with the alt-down alt-left/right commands going one diff block at a time.
In meld, these commands operate depending on focus. When the focus is in the left file, alt-right merges to the right, but you cannot do alt-left to merge from the right file.
Re: Meld is a visual diff and merge tool targeted at developers
#18I try a few times, and always I get back to kdiff3. I feel less confuse with the 3 way view and separated merge output view.
Re: Meld is a visual diff and merge tool targeted at developers
#19I've been using Meld since years ago, and it's my default go-to diff viewer. The visual style they implemented helps me a lot to reason about how lines have been added or deleted from documents in the side by side comparison. Very neat! The directory contents tree diff is also really useful. I wish they made it even easier the basic case of comparing aribtrary text. Maybe it should be the default mode after opening t…
Meld already supports text filters!
Re: Meld is a visual diff and merge tool targeted at developers
#20BeyondCompare is much better and available on macOS too.
I use Beyond Compare mainly for sync of folders by comparing files (sizes, dates) and not for file contents diff as such. Part of my backup strategy while copying/syncing file between windows/mac/NAS ;-)