I am normally just a command line guy, but I really do prefer SourceTree for merging and moving/visualizing branches. And it makes it nice to add only hunks of a file.