I highly recommend Sublime Merge. It's especially good for those that know git well already.