I use Tower. It's a commercial solution but the interface is the best I've used. That being said, I wish the tree diagram could be more useful.
Outside of merging, CLI is still the fastest and requires the least amount of mouse movements and clicks. :)