Mercurial, just use it
I did a trade study while planning to move away from that terrible and expensive IBM product, and came to the conclusion that git is powerful, and git hub rocks. If you do development in mixed environments and want a seamless tool just use mercurial. Great windows integration, great visual studio integration, great command line... the one down side is the inability to flatten history (which I don't miss) and the number of ways you can branch leads to confusion.
To all the subversion users out there.... best practice for merging subversion branches is pulling the branches into mercurial, merge, then deliver the result back to subversion. Time to go DCVS.
To all the TortoiseGit and GitExtensions users out there. Try TortiseHG and Visual HG, you'll think you're doing it wrong because there was no swearing and arm waving.
But... I'll give the new git client a go.