[bastijn]

Agree with all of your points. SourceTree nowadays does not select by default (at least my setup doesn't) but it's still far from optimal.

WinMerge? On Windows? I'm using beyond compare which is pretty nice when correctly configured, tortoise internal diff ain't bad either. Both have three way diff which I consider standard for any diff tool. Jetbrains indeed get a lot of things right. Using their resharper (visual studio), webstorms and itellij ultimate versions. They make amazing products.