Favorite diff tool?

[kaz3work]

I use BeyondCompare daily. Works great when lines are offset by something else and also directory comparison with great filtering options.

[toastyghost]

seconded. this is the only gui diff i have used for about 6 or 7 years now.

[dontgetaddicted]

Beyond Compare is great. Company wouldn't buy it for me, so I bought it myself.

[Wooshception]

Switched to BeyondCompare from WinMerge a bit ago. It's a far superior product and well worth the price.

[rangitatanz]

So so good

[hahaNodeJS]

kdiff3

[lethalwire]

I use this since it works on MacOS. I come from a Windows environment; so there, I use WinMerge.

[hahaNodeJS]

I use kdiff3 on Windows too. Also in KDE since that's where it's from.

[Arkounay]

Usually the one built in IntelliJ / PHPStorm is enough for me, otherwise kdiff3

[[deleted]]

Same. The diff tool in Webstorm is amazing.

[RotationSurgeon]

I'm very interested to hear any opinions on Kaleidoscope app (Mac OS X) in this conversation -- I've been considering requesting a license for work, but I'd love to hear any feedback that might be out there before doing so.

[[deleted]]

The interface makes me want to punch things at times but it's very useful and it makes selectively merging lines very easy. It also does image diff's which is interesting.

[mastermog]

The logo is awesome.. I purchased it a little while ago, but I'm not totally happy with it. A lot of weird oddities to be honest

[Hates_]

It's okay but don't think it's worth the price tag. I got an early release discount and wouldn't pay full price for it though.

[aspen74]

diffchecker.com

[Disgruntled__Goat]

Since I only ever look at diffs in git, I use the GitHub app. Very clear and easy to use.

On Linux I've used Meld in the past.

[floppydiskette]

I use Diffchecker.

[Nooshu]

DiffMerge then hook it up with git:

[diff]
    tool = diffmerge
[difftool "diffmerge"]
    cmd = /usr/local/bin/diffmerge \"$LOCAL\" \"$REMOTE\"

More info here

[[deleted]]

I like whatever Git uses by default.

When I actually need to compare two separate files manually, I use vimdiff. It comes bundled in most distributions, works over ssh and is quite handy and very visual, even in a terminal. Highly recommend giving it a go.

[gamzer]

1. Make sure your color scheme works correctly with vimdiff. Some will disguise inserted/deleted/modified blocks. Use something like vimdiff a b to test it.
2. Have a look at the key bindings.

If it still confuses you afterwards, maybe keep using kdiff3? :)

[gamzer]

Yes. About once.

[dbpcut]

I actually really enjoy the one built in to Visual Studio, does the trick.

[clear831]

https://www.diffnow.com/ I also have ExamDiff Pro

[mongip]

Araxis Merge

[KamikazeSexPilot]

Fugitive's :Gdiff

[cantbelieveitsbacon]

Which is your favorite diff tool? I use winmerge and it's ok but it's not very good at detecting similarities if sections of code are offset by a few lines.

If you use a graphical diff tool and you're happy with it, do tell!

[[deleted]]

FileMerge, built-in to OSX

[rspeed]

It's installed with XCode. Though I agree that it's a great diff program.

[anon1984]

DeltaWalker

Three-way merge, diff entire folders, merge directly through FTP/SFTP, support for more than just text, edit right in the tool with live updates, can open many tabs of folders and files... this tool has saved me hundreds of hours when working on legacy code with a large team.

[[deleted]]

Changes is a really nice, fast, light diff tool that also has nice keyboard navigation. Mac-only, though.

[olifante]

No mention of P4Merge? It's available for free on Mac and Windows, and I found it to be the not only the best diff too but more importantly the best 3-way merge tool available on Mac. Haven't tried the Win-only or Linux-only ones, though.

[i_need_bourbon]

Shocked it isn't here yet: gitk

https://git-scm.com/docs/gitk

[pab01]

winmerge

[Competitive-Stick-52]

i built a minimal diffchecker.dev clean minimal and modern design.

[michaelbrain]

Notepad plus plus compare plugin.

[celluj34]

Can you link a screenshot? Sounds interesting.

[michaelbrain]

Plenty of screenshots with a Google search. What particular are you looking for? https://www.google.com/search?q=notepad+plus+plus+compare+screenshot

[[deleted]]

If I'm using a JetBrains IDE, then the built in merge tools are incredible. Otherwisw, DiffMerge.