Ask HN: What difftools and mergetools do you use on Mac?

4 points·sinsquare··6 comments

- What do you like? - What do you dislike?

I've been using DiffMerge and KDiff3 for years.

They are largely great tools, but I'm looking for something with a bit more functionality. I would like something that I could only refer to as a Staging tool so that I can really control which of my code changes are assigned to each commit.

I havne't converted to any of the tools built into the IDEs I use because I'm using quite a few, and don't want to use a different Git tool just because I'm on a different IDE.

One of the most annoying things for me about DiffMerge is how it shows a popup window on launch, and I also find it a bit too difficult to change the color palette since I can't easy choose a theme. Otherwise I find it fairly feature complete for my needs.

It's built into my IDE (Jetbrains). Works great. Pretty sure VScode has something similar?

There's also GitKraken and Sublime Merge.

vimdiff, same as on Linux and Windows.

I also use vimdiff. It’s magic.

What is so great about it?

I do feel like I'm missing out on something here, but it's hard to quantify what it is.

Blank spaces are color coded so for easier detection, I can edit the file if I need to, and there are diffupdate commands for piecemeal merging of sections of the files.

Reply on news.ycombinator.com