Try any of the recommendations here (my poison is Meld). It's actually one of the few tasks where I really, really do prefer a GUI over text.