[nicoburns]

You should also give Sublime Merge a go. I'm mostly a CLI git user, but Sublime Merge is so lightweight (and intuitive to someone who knows git), it's had me using it quite a bit.