Giving Sublime Merge a shot. I am not a fan of using GUIs where CLI does the job way better but the guys at Sublime know a thing or two about making tools... or at least it seems that they care and think about it... So I figured at least I will give it a shot for now!

Captured with Snapper App