My two cents

[MarkMurphy]

Have you looked at sublimerge?

Yes, I've tried it out and I'm not a fan. It shows this on their website but doesn't offer this functionality out of the box and I'm not sure if purchasing a licence fixes that or not. Even if buying a licence does unlock that functionality I would still prefer to see an implementation that's more of a clone to what Netbeans does. The highlighting extending all the way across the view makes it much easier to compare. And I would like to see context options or buttons to do the any of the following:

In the context of either theirs or mine at the top of each file : "Accept", "Accept & Next"
In the context of a block of code in conflict a right click might reveal: "Use mine before theirs", "Use theirs before mine", "Use this whole block", "Use this whole file"

Within Netbeans I can currently do the following:

Right clicking anywhere in the project file tree that is under source control, I can see Git -> "Resolve conflicts..." is there but disabled unless there are actually conflicts somewhere in the project.

Clicking on "Resolve conflicts..." opens this interface: