I'm using Git Gui, which is part of the msysgit (windows git client), start it simply by typing "git gui" in the console. It can do the basic stuff. For merging, I do have TortoiseGit installed, but don't use it otherwise, it has munched up my repo several times, I don't consider it stable enough yet.
Still, you will need to do at least some work in cmdline
Still, you will need to do at least some work in cmdline