Posted Jun 2, 2010 23:21 UTC (Wed) by bfeeney (guest, #6855)
Parent article: Giggle: A Git GUI
I'd recommend SmartGit myself. The basic version is free, but you pay for more advanced functionality. It has a very good diff/merge tool, and is dead easy to use.