[pilif]

Sublime Merge is cough sublimely good at performing 3-way merges.

I don't like it as much as a generic git frontend (nothing beats the command line once you're used to it, but for 3-way merges, it's absolutely perfect and I have yet to see anything better.

Another very good tool for 3-way merges is meld, but the macOS port (where I do most of my development work on) is not very good, mostly because the GTK macOS port isn't very good.

[alimbada]

I tried Meld for 3-way merges and while it seemed ok I prefer P4Merge. It's free, but not open source. If I'm using Jetbrains tools though, I'll always use the built in merge tool as it's the most intuitive to use in my experience.

[rationably]

> yet to see anything better.

Try Beyond Compare v5.

[wodenokoto]

It’s also very good at committing chunks, especially from different files in the same commit.

It’s not good at getting an overview of your history or blaming, but for committing and merging it is really nice

[fastball]

What don't you like about the blame interface?

[pilif]

I'm not OP, but here's my two qualms with using Sublime Merge for blame:

* it doesn't do a good enough job following renames (in cases where you would need to use `--follow` to `git log`. `git gui blame` does.

* while there is a "blame parent commit" feature, it's a bit hidden and it's super slow to provide the updated blame.

[wodenokoto]

Maybe they improved, I actually haven’t tried for years. I mostly would click blame on a line in sublime text and leave it at that. I just never felt smerge was good at digging around history. Maybe I’ll give it another try

[tored]

I use WinMerge for that, unfortunately, as the name implies, Windows only.

[ubercow13]

I don't think WinMerge supports proper 3 way merge..